UserEventsController cleanup