tons more event-related cleanup