Revert "Remove event listeners on destroy"

Move this to a separate branch
This reverts commit 69dfb822374a0ba08ac3052cb5ae599dcf11f6fc.
Remove event listener on destroy