diff --git a/php/BUILD.bazel b/php/BUILD.bazel
index c41644e9b3..1845e13974 100644
--- a/php/BUILD.bazel
+++ b/php/BUILD.bazel
@@ -27,19 +27,10 @@ _RUNTIME_SOURCES = [
     "src/Google/Protobuf/Internal/CodedOutputStream.php",
     "src/Google/Protobuf/Internal/Descriptor.php",
     "src/Google/Protobuf/Internal/DescriptorPool.php",
-    "src/Google/Protobuf/Internal/EnumDescriptorProto_EnumReservedRange.php",
-    "src/Google/Protobuf/Internal/DescriptorProto_ExtensionRange.php",
-    "src/Google/Protobuf/Internal/DescriptorProto_ReservedRange.php",
     "src/Google/Protobuf/Internal/EnumBuilderContext.php",
     "src/Google/Protobuf/Internal/EnumDescriptor.php",
     "src/Google/Protobuf/Internal/FieldDescriptor.php",
-    "src/Google/Protobuf/Internal/FieldDescriptorProto_Label.php",
-    "src/Google/Protobuf/Internal/FieldDescriptorProto_Type.php",
-    "src/Google/Protobuf/Internal/FieldOptions_CType.php",
-    "src/Google/Protobuf/Internal/FieldOptions_JSType.php",
     "src/Google/Protobuf/Internal/FileDescriptor.php",
-    "src/Google/Protobuf/Internal/FileOptions_OptimizeMode.php",
-    "src/Google/Protobuf/Internal/GeneratedCodeInfo_Annotation.php",
     "src/Google/Protobuf/Internal/GetPublicDescriptorTrait.php",
     "src/Google/Protobuf/Internal/GPBDecodeException.php",
     "src/Google/Protobuf/Internal/GPBJsonWire.php",
@@ -54,15 +45,12 @@ _RUNTIME_SOURCES = [
     "src/Google/Protobuf/Internal/MapFieldIter.php",
     "src/Google/Protobuf/Internal/Message.php",
     "src/Google/Protobuf/Internal/MessageBuilderContext.php",
-    "src/Google/Protobuf/Internal/MethodOptions_IdempotencyLevel.php",
     "src/Google/Protobuf/Internal/OneofDescriptor.php",
     "src/Google/Protobuf/Internal/OneofField.php",
     "src/Google/Protobuf/Internal/RawInputStream.php",
     "src/Google/Protobuf/Internal/RepeatedField.php",
     "src/Google/Protobuf/Internal/RepeatedFieldIter.php",
-    "src/Google/Protobuf/Internal/SourceCodeInfo_Location.php",
     "src/Google/Protobuf/Internal/TimestampBase.php",
-    "src/Google/Protobuf/Internal/UninterpretedOption_NamePart.php",
     "src/Google/Protobuf/OneofDescriptor.php",
 ]
 
diff --git a/php/src/Google/Protobuf/Internal/DescriptorProto_ExtensionRange.php b/php/src/Google/Protobuf/Internal/DescriptorProto_ExtensionRange.php
deleted file mode 100644
index c928fbe5b1..0000000000
--- a/php/src/Google/Protobuf/Internal/DescriptorProto_ExtensionRange.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-if (false) {
-    /**
-     * This class is deprecated. Use Google\Protobuf\Internal\DescriptorProto\ExtensionRange instead.
-     * @deprecated
-     */
-    class DescriptorProto_ExtensionRange {}
-}
-class_exists(DescriptorProto\ExtensionRange::class);
-@trigger_error('Google\Protobuf\Internal\DescriptorProto_ExtensionRange is deprecated and will be removed in the next major release. Use Google\Protobuf\Internal\DescriptorProto\ExtensionRange instead', E_USER_DEPRECATED);
-
diff --git a/php/src/Google/Protobuf/Internal/DescriptorProto_ReservedRange.php b/php/src/Google/Protobuf/Internal/DescriptorProto_ReservedRange.php
deleted file mode 100644
index e49e945f97..0000000000
--- a/php/src/Google/Protobuf/Internal/DescriptorProto_ReservedRange.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-if (false) {
-    /**
-     * This class is deprecated. Use Google\Protobuf\Internal\DescriptorProto\ReservedRange instead.
-     * @deprecated
-     */
-    class DescriptorProto_ReservedRange {}
-}
-class_exists(DescriptorProto\ReservedRange::class);
-@trigger_error('Google\Protobuf\Internal\DescriptorProto_ReservedRange is deprecated and will be removed in the next major release. Use Google\Protobuf\Internal\DescriptorProto\ReservedRange instead', E_USER_DEPRECATED);
-
diff --git a/php/src/Google/Protobuf/Internal/EnumDescriptorProto_EnumReservedRange.php b/php/src/Google/Protobuf/Internal/EnumDescriptorProto_EnumReservedRange.php
deleted file mode 100644
index b1b59ed91f..0000000000
--- a/php/src/Google/Protobuf/Internal/EnumDescriptorProto_EnumReservedRange.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-if (false) {
-    /**
-     * This class is deprecated. Use Google\Protobuf\Internal\EnumDescriptorProto\EnumReservedRange instead.
-     * @deprecated
-     */
-    class EnumDescriptorProto_EnumReservedRange {}
-}
-class_exists(EnumDescriptorProto\EnumReservedRange::class);
-@trigger_error('Google\Protobuf\Internal\EnumDescriptorProto_EnumReservedRange is deprecated and will be removed in the next major release. Use Google\Protobuf\Internal\EnumDescriptorProto\EnumReservedRange instead', E_USER_DEPRECATED);
-
diff --git a/php/src/Google/Protobuf/Internal/FieldDescriptorProto_Label.php b/php/src/Google/Protobuf/Internal/FieldDescriptorProto_Label.php
deleted file mode 100644
index 218a846e1e..0000000000
--- a/php/src/Google/Protobuf/Internal/FieldDescriptorProto_Label.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-if (false) {
-    /**
-     * This class is deprecated. Use Google\Protobuf\Internal\FieldDescriptorProto\Label instead.
-     * @deprecated
-     */
-    class FieldDescriptorProto_Label {}
-}
-class_exists(FieldDescriptorProto\Label::class);
-@trigger_error('Google\Protobuf\Internal\FieldDescriptorProto_Label is deprecated and will be removed in the next major release. Use Google\Protobuf\Internal\FieldDescriptorProto\Label instead', E_USER_DEPRECATED);
-
diff --git a/php/src/Google/Protobuf/Internal/FieldDescriptorProto_Type.php b/php/src/Google/Protobuf/Internal/FieldDescriptorProto_Type.php
deleted file mode 100644
index fd8d449a57..0000000000
--- a/php/src/Google/Protobuf/Internal/FieldDescriptorProto_Type.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-if (false) {
-    /**
-     * This class is deprecated. Use Google\Protobuf\Internal\FieldDescriptorProto\Type instead.
-     * @deprecated
-     */
-    class FieldDescriptorProto_Type {}
-}
-class_exists(FieldDescriptorProto\Type::class);
-@trigger_error('Google\Protobuf\Internal\FieldDescriptorProto_Type is deprecated and will be removed in the next major release. Use Google\Protobuf\Internal\FieldDescriptorProto\Type instead', E_USER_DEPRECATED);
-
diff --git a/php/src/Google/Protobuf/Internal/FieldOptions_CType.php b/php/src/Google/Protobuf/Internal/FieldOptions_CType.php
deleted file mode 100644
index 4d18783ee2..0000000000
--- a/php/src/Google/Protobuf/Internal/FieldOptions_CType.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-if (false) {
-    /**
-     * This class is deprecated. Use Google\Protobuf\Internal\FieldOptions\CType instead.
-     * @deprecated
-     */
-    class FieldOptions_CType {}
-}
-class_exists(FieldOptions\CType::class);
-@trigger_error('Google\Protobuf\Internal\FieldOptions_CType is deprecated and will be removed in the next major release. Use Google\Protobuf\Internal\FieldOptions\CType instead', E_USER_DEPRECATED);
-
diff --git a/php/src/Google/Protobuf/Internal/FieldOptions_JSType.php b/php/src/Google/Protobuf/Internal/FieldOptions_JSType.php
deleted file mode 100644
index 9db0782221..0000000000
--- a/php/src/Google/Protobuf/Internal/FieldOptions_JSType.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-if (false) {
-    /**
-     * This class is deprecated. Use Google\Protobuf\Internal\FieldOptions\JSType instead.
-     * @deprecated
-     */
-    class FieldOptions_JSType {}
-}
-class_exists(FieldOptions\JSType::class);
-@trigger_error('Google\Protobuf\Internal\FieldOptions_JSType is deprecated and will be removed in the next major release. Use Google\Protobuf\Internal\FieldOptions\JSType instead', E_USER_DEPRECATED);
-
diff --git a/php/src/Google/Protobuf/Internal/FileOptions_OptimizeMode.php b/php/src/Google/Protobuf/Internal/FileOptions_OptimizeMode.php
deleted file mode 100644
index 8926e63baa..0000000000
--- a/php/src/Google/Protobuf/Internal/FileOptions_OptimizeMode.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-if (false) {
-    /**
-     * This class is deprecated. Use Google\Protobuf\Internal\FileOptions\OptimizeMode instead.
-     * @deprecated
-     */
-    class FileOptions_OptimizeMode {}
-}
-class_exists(FileOptions\OptimizeMode::class);
-@trigger_error('Google\Protobuf\Internal\FileOptions_OptimizeMode is deprecated and will be removed in the next major release. Use Google\Protobuf\Internal\FileOptions\OptimizeMode instead', E_USER_DEPRECATED);
-
diff --git a/php/src/Google/Protobuf/Internal/GeneratedCodeInfo_Annotation.php b/php/src/Google/Protobuf/Internal/GeneratedCodeInfo_Annotation.php
deleted file mode 100644
index e36f1e573d..0000000000
--- a/php/src/Google/Protobuf/Internal/GeneratedCodeInfo_Annotation.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-if (false) {
-    /**
-     * This class is deprecated. Use Google\Protobuf\Internal\GeneratedCodeInfo\Annotation instead.
-     * @deprecated
-     */
-    class GeneratedCodeInfo_Annotation {}
-}
-class_exists(GeneratedCodeInfo\Annotation::class);
-@trigger_error('Google\Protobuf\Internal\GeneratedCodeInfo_Annotation is deprecated and will be removed in the next major release. Use Google\Protobuf\Internal\GeneratedCodeInfo\Annotation instead', E_USER_DEPRECATED);
-
diff --git a/php/src/Google/Protobuf/Internal/MethodOptions_IdempotencyLevel.php b/php/src/Google/Protobuf/Internal/MethodOptions_IdempotencyLevel.php
deleted file mode 100644
index a291311455..0000000000
--- a/php/src/Google/Protobuf/Internal/MethodOptions_IdempotencyLevel.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-if (false) {
-    /**
-     * This class is deprecated. Use Google\Protobuf\Internal\MethodOptions\IdempotencyLevel instead.
-     * @deprecated
-     */
-    class MethodOptions_IdempotencyLevel {}
-}
-class_exists(MethodOptions\IdempotencyLevel::class);
-@trigger_error('Google\Protobuf\Internal\MethodOptions_IdempotencyLevel is deprecated and will be removed in the next major release. Use Google\Protobuf\Internal\MethodOptions\IdempotencyLevel instead', E_USER_DEPRECATED);
-
diff --git a/php/src/Google/Protobuf/Internal/SourceCodeInfo_Location.php b/php/src/Google/Protobuf/Internal/SourceCodeInfo_Location.php
deleted file mode 100644
index 1346492d25..0000000000
--- a/php/src/Google/Protobuf/Internal/SourceCodeInfo_Location.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-if (false) {
-    /**
-     * This class is deprecated. Use Google\Protobuf\Internal\SourceCodeInfo\Location instead.
-     * @deprecated
-     */
-    class SourceCodeInfo_Location {}
-}
-class_exists(SourceCodeInfo\Location::class);
-@trigger_error('Google\Protobuf\Internal\SourceCodeInfo_Location is deprecated and will be removed in the next major release. Use Google\Protobuf\Internal\SourceCodeInfo\Location instead', E_USER_DEPRECATED);
-
diff --git a/php/src/Google/Protobuf/Internal/UninterpretedOption_NamePart.php b/php/src/Google/Protobuf/Internal/UninterpretedOption_NamePart.php
deleted file mode 100644
index 9750eb010d..0000000000
--- a/php/src/Google/Protobuf/Internal/UninterpretedOption_NamePart.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-if (false) {
-    /**
-     * This class is deprecated. Use Google\Protobuf\Internal\UninterpretedOption\NamePart instead.
-     * @deprecated
-     */
-    class UninterpretedOption_NamePart {}
-}
-class_exists(UninterpretedOption\NamePart::class);
-@trigger_error('Google\Protobuf\Internal\UninterpretedOption_NamePart is deprecated and will be removed in the next major release. Use Google\Protobuf\Internal\UninterpretedOption\NamePart instead', E_USER_DEPRECATED);
-