clean-up, reorg