Cleaning up Event.cs