removeEvent partially complete, testing now