remove event name from handlers, fixes #5