CFY-949 cleanup