Remove dead code
Make a base handler for common events