event emitter removeEventListener fixes