CFY-1025 cleanup