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/child_model.proto b/hpb_generator/tests/child_model.proto
index ba410d25f5..9b4272a1f3 100644
--- a/hpb_generator/tests/child_model.proto
+++ b/hpb_generator/tests/child_model.proto
@@ -17,11 +17,11 @@ message ChildModel1 {
 }
 
 message ChildModel3 {
-  string sub_key = 1 [features.field_presence = IMPLICIT];
+  string sub_key = 1;
 
-  bool bool1 = 2 [features.field_presence = IMPLICIT];
+  bool bool1 = 2;
 
-  int32 i32 = 3 [features.field_presence = IMPLICIT];
+  int32 i32 = 3;
 
   string opt_str = 4;
   bool opt_bool = 5;
diff --git a/hpb_generator/tests/legacy-name.proto b/hpb_generator/tests/legacy-name.proto
index d16d0adb3b..48527bcc00 100644
--- a/hpb_generator/tests/legacy-name.proto
+++ b/hpb_generator/tests/legacy-name.proto
@@ -9,8 +9,6 @@ edition = "2023";
 
 package hpb_unittest;
 
-// option java_multiple_files = true;
-
 enum LegacyEnum {
   PHASE_DEFAULT = 0;
   PHASE_BUSY = 1;
diff --git a/hpb_generator/tests/no_package_enum_user.proto b/hpb_generator/tests/no_package_enum_user.proto
index 21cda76bfa..98b149f3ee 100644
--- a/hpb_generator/tests/no_package_enum_user.proto
+++ b/hpb_generator/tests/no_package_enum_user.proto
@@ -11,8 +11,6 @@ package hpb_unittest;
 
 import "google/protobuf/compiler/hpb/tests/no_package.proto";
 
-// option java_multiple_files = true;
-
 message MyMessage {
   MessageWithEnumUpbTest my_type = 1;
 }