Finish migration over to new event_listener