Removed shared fromt EventHandlers.getEventHandlers
Removed some unused imports