fix tabbing error
Simplify id for removeEvent
oops, use identifier as key rather than event
Remove all references to the event