rename and remove stuff