CFY-644 code cleanup