More cleanup. Fix typos and Event.remove() invocation.