remove stuff
remove some more stuff