CFY-1850 more cleanup