reorg cleanup