CFY-1433 some cleanup