CFY-1274 code cleanup