CFY-1145 more cleanup