Remove the centralized event handling