CFY-644 some cleanup