more cleanup/reorg