remove unneeded stuff
remove unneeded stuff