Fix cleaning up event listeners.
Fix cleaning up event listeners.

arendjr/selectivity,estantevirtual/selectivity,arendjr/selectivity,SpeakapBV/selectivity,estantevirtual/selectivity,SpeakapBV/selectivity