removed removeEventListener
usability changes