Remove event listeners on $destroy.
Remove unneeded return.

- Change was removed, add it back.