remove a bunch of stuff unused after the reorg
remove a bunch more stuff that I'm not using