attempt to clean up wait_for_event and dependent actions