Adding some code to automatically remove a bunch of event handlers at once (use ResettableEventBus ?)
Refactoring.