fixed remove stuff