#10314 cleanup