remove a few more things
remove a few more things