CFY-648 some cleanup