reorg and clean