CFY-1308 some cleanup