cleanup reorg