remove stuff, fix a bug