Fixed removal of non-existent listeners.