more cleanup due to reorg