CFY-1222 code cleanup