remove a lot more stuff, move things around