Clean up the delete and remove stuff.