CFY-1741 code cleanup