Fix listeners clearance