CFY-1295 more cleanup