forgot a few more things to remove