diff --git a/csharp/src/Google.Protobuf/Reflection/FeatureSetDescriptor.g.cs b/csharp/src/Google.Protobuf/Reflection/FeatureSetDescriptor.g.cs
deleted file mode 100644
index 208ce1fcb6..0000000000
--- a/csharp/src/Google.Protobuf/Reflection/FeatureSetDescriptor.g.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file or at
-// https://developers.google.com/open-source/licenses/bsd
-#endregion
-
-namespace Google.Protobuf.Reflection;
-
-internal sealed partial class FeatureSetDescriptor
-{
-    // Canonical serialized form of the edition defaults, generated by embed_edition_defaults.
-    private const string DefaultsBase64 =
-        "ChMYhAciACoMCAEQAhgCIAMoATACChMY5wciACoMCAIQARgBIAIoATABChMY6AciDAgBEAEYASACKAEwASoAIOYHKOgH";
-}
diff --git a/hpb_generator/tests/test_model.proto b/hpb_generator/tests/test_model.proto
index 5bb50be1a2..434b3d8aae 100644
--- a/hpb_generator/tests/test_model.proto
+++ b/hpb_generator/tests/test_model.proto
@@ -10,7 +10,6 @@ edition = "2023";
 package hpb_unittest;
 
 import "google/protobuf/compiler/hpb/tests/child_model.proto";
-import "google/protobuf/cpp_features.proto";
 
 option features.enum_type = CLOSED;
 option features.repeated_field_encoding = EXPANDED;