remove stuff
fixed a bad bug