simplify event listener removal
Merge pull request #484 from RustyToms/simplify_listener_removal

simplify event listener removal