CFY-974 cleanup