Cleanup generic handlers, remove unused events