CFY-1318 code cleanup