cleanup; reorg