CFY-1849 more cleanup