cleanup reorg mess