CFY-1152 cleanup