Quick clean up of listeners