CFY-1318 cleanup
CFY-1318 cleanup