fix remove EventListener when they're done