fix and remove stuff