remove more stuff
move things around