CFY-3 code cleanup