working on Event.remove
add test for Event.remove
refactor
refactor events
normalize event object