CFY-1433 code cleanup