Removed unused listeners