CFY-1848 code cleanup