CFY-1222 cleanup