CFY-1295 small cleanup