CFY-768 cleanup