CFY-1433 small code cleanup