fixing remove stuff