clean up and reorg