cleanup, reorg