Remove commented out MessageListener impl
Update EventHandler annotations
Clean up unused imports
Add event handler import