Removed unused
Lots of reorg