Removing leaking listeners