While busy cleaning, also removed extra enters