Event system cleanup
Simplify delay-event