CFY-1295 cleanup