Reorg some junk