cleanup, reorg, etc