CFY-734 cleanup