CFY-1849 code cleanup