EventController -> EventRepository Cleanup