cleaned up in both events_controllers