Fix remove event listener