CFY-516 cleanup