CFY-859 cleanup