diff --git a/src/Symfony/Bundle/Resources/config/doctrine_mongodb_odm.xml b/src/Symfony/Bundle/Resources/config/doctrine_mongodb_odm.xml
index 0d5596d0777..126995326d5 100644
--- a/src/Symfony/Bundle/Resources/config/doctrine_mongodb_odm.xml
+++ b/src/Symfony/Bundle/Resources/config/doctrine_mongodb_odm.xml
@@ -149,15 +149,6 @@
             <argument type="service" id="doctrine_mongodb" />
             <argument type="service" id="api_platform.doctrine.odm.metadata.resource.metadata_collection_factory.inner" />
         </service>
-
-        <service id="api_platform.doctrine_mongodb.odm.metadata.property.identifier_metadata_factory"
-                 class="ApiPlatform\Doctrine\Odm\Metadata\Property\DoctrineMongoDbOdmPropertyMetadataFactory"
-                 decorates="api_platform.metadata.property.identifier_metadata_factory"
-                 decoration-priority="40">
-            <argument type="service" id="doctrine_mongodb"/>
-            <argument type="service" id="api_platform.doctrine_mongodb.odm.metadata.property.identifier_metadata_factory.inner"/>
-        </service>
-
     </services>
 
 </container>
diff --git a/src/Symfony/Bundle/Resources/config/doctrine_orm.xml b/src/Symfony/Bundle/Resources/config/doctrine_orm.xml
index eccbc17382d..112c4f6d252 100644
--- a/src/Symfony/Bundle/Resources/config/doctrine_orm.xml
+++ b/src/Symfony/Bundle/Resources/config/doctrine_orm.xml
@@ -126,11 +126,6 @@
             <argument type="service" id="api_platform.doctrine.orm.metadata.property.metadata_factory.inner" />
         </service>
 
-        <service id="api_platform.doctrine.orm.metadata.property.identifier_metadata_factory" class="ApiPlatform\Doctrine\Orm\Metadata\Property\DoctrineOrmPropertyMetadataFactory" decorates="api_platform.metadata.property.identifier_metadata_factory" decoration-priority="40">
-            <argument type="service" id="doctrine" />
-            <argument type="service" id="api_platform.doctrine.orm.metadata.property.identifier_metadata_factory.inner" />
-        </service>
-
         <service id="api_platform.doctrine.orm.state.collection_provider" class="ApiPlatform\Doctrine\Orm\State\CollectionProvider" public="false">
             <argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
             <argument type="service" id="doctrine" />
diff --git a/src/Symfony/Bundle/Resources/config/metadata/links.xml b/src/Symfony/Bundle/Resources/config/metadata/links.xml
index 9e590a6a074..8a0e844e60c 100644
--- a/src/Symfony/Bundle/Resources/config/metadata/links.xml
+++ b/src/Symfony/Bundle/Resources/config/metadata/links.xml
@@ -7,7 +7,7 @@
     <services>
         <service id="api_platform.metadata.resource.link_factory" class="ApiPlatform\Metadata\Resource\Factory\LinkFactory" public="false">
             <argument type="service" id="api_platform.metadata.property.name_collection_factory" />
-            <argument type="service" id="api_platform.metadata.property.identifier_metadata_factory" />
+            <argument type="service" id="api_platform.metadata.property.metadata_factory" />
             <argument type="service" id="api_platform.resource_class_resolver" />
         </service>
     </services>
diff --git a/src/Symfony/Bundle/Resources/config/metadata/property.xml b/src/Symfony/Bundle/Resources/config/metadata/property.xml
index 03478189cda..1a0e221399a 100644
--- a/src/Symfony/Bundle/Resources/config/metadata/property.xml
+++ b/src/Symfony/Bundle/Resources/config/metadata/property.xml
@@ -42,33 +42,6 @@
             <argument type="service" id="api_platform.metadata.property_extractor.xml" />
         </service>
 
-        <!-- Property metadata used to compute identifiers, we want to avoid using the serializer property metadata factory -->
-        <!-- TODO: in 3.0 the serializer property metadata factory doesn't need the resource metadata anymore so these will be removed -->
-        <service id="api_platform.metadata.property.identifier_metadata_factory" alias="api_platform.metadata.property.identifier_metadata_factory.property_info" />
-
-        <service id="api_platform.metadata.property.identifier_metadata_factory.property_info" class="ApiPlatform\Metadata\Property\Factory\PropertyInfoPropertyMetadataFactory" public="false">
-            <argument type="service" id="api_platform.property_info" />
-        </service>
-
-        <service id="api_platform.metadata.property.identifier_metadata_factory.attribute" class="ApiPlatform\Metadata\Property\Factory\AttributePropertyMetadataFactory" decorates="api_platform.metadata.property.identifier_metadata_factory" public="false" decoration-priority="20">
-            <argument type="service" id="api_platform.metadata.property.identifier_metadata_factory.attribute.inner" />
-        </service>
-
-        <service id="api_platform.metadata.property.identifier_metadata_factory.xml" decorates="api_platform.metadata.property.identifier_metadata_factory" class="ApiPlatform\Metadata\Property\Factory\ExtractorPropertyMetadataFactory" public="false" decoration-priority="10">
-            <argument type="service" id="api_platform.metadata.property_extractor.xml" />
-            <argument type="service" id="api_platform.metadata.property.identifier_metadata_factory.xml.inner" />
-        </service>
-
-        <service id="api_platform.metadata.property.identifier_metadata_factory.identifier" decorates="api_platform.metadata.property.identifier_metadata_factory" decoration-priority="30" class="ApiPlatform\Metadata\Property\Factory\IdentifierPropertyMetadataFactory" public="false">
-            <argument type="service" id="api_platform.resource_class_resolver" />
-            <argument type="service" id="api_platform.metadata.property.identifier_metadata_factory.identifier.inner" />
-        </service>
-
-        <service id="api_platform.metadata.property.identifier_metadata_factory.cached" class="ApiPlatform\Metadata\Property\Factory\CachedPropertyMetadataFactory" decorates="api_platform.metadata.property.identifier_metadata_factory" decoration-priority="-10" public="false">
-            <argument type="service" id="api_platform.cache.metadata.property" />
-            <argument type="service" id="api_platform.metadata.property.identifier_metadata_factory.cached.inner" />
-        </service>
-
         <!-- Cache -->
         <service id="api_platform.cache.metadata.property" parent="cache.system" public="false">
             <tag name="cache.pool" />
diff --git a/src/Symfony/Bundle/Resources/config/metadata/yaml.xml b/src/Symfony/Bundle/Resources/config/metadata/yaml.xml
index 03629c0dc38..ca494e63a8c 100644
--- a/src/Symfony/Bundle/Resources/config/metadata/yaml.xml
+++ b/src/Symfony/Bundle/Resources/config/metadata/yaml.xml
@@ -37,10 +37,5 @@
             <argument type="service" id="api_platform.metadata.property_extractor.yaml" />
             <argument type="service" id="api_platform.metadata.property.name_collection_factory.yaml.inner" />
         </service>
-
-        <service id="api_platform.metadata.property.identifier_metadata_factory.yaml" class="ApiPlatform\Metadata\Property\Factory\ExtractorPropertyMetadataFactory" decorates="api_platform.metadata.property.identifier_metadata_factory" decoration-priority="20" public="false">
-            <argument type="service" id="api_platform.metadata.property_extractor.yaml" />
-            <argument type="service" id="api_platform.metadata.property.identifier_metadata_factory.yaml.inner" />
-        </service>
     </services>
 </container>
diff --git a/tests/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php b/tests/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php
index 0a51cca0cb8..304fa59b19e 100644
--- a/tests/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php
+++ b/tests/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php
@@ -353,9 +353,6 @@ public function testMetadataConfiguration(): void
             'api_platform.metadata.property.metadata_factory.cached',
             'api_platform.metadata.property.metadata_factory.default_property',
             'api_platform.metadata.property.metadata_factory.xml',
-            'api_platform.metadata.property.identifier_metadata_factory.attribute',
-            'api_platform.metadata.property.identifier_metadata_factory.xml',
-            'api_platform.metadata.property.identifier_metadata_factory.yaml',
             'api_platform.cache.metadata.property',
 
             // metadata/property_name.xml
@@ -400,7 +397,6 @@ public function testMetadataConfiguration(): void
             PropertyNameCollectionFactoryInterface::class,
 
             // metadata/property.xml
-            'api_platform.metadata.property.identifier_metadata_factory',
             'api_platform.metadata.property.metadata_factory',
 
             // metadata/resource.xml
@@ -815,7 +811,6 @@ public function testDoctrineMongoDbOdmConfiguration(): void
             'api_platform.doctrine_mongodb.odm.aggregation_extension.filter',
             'api_platform.doctrine_mongodb.odm.aggregation_extension.pagination',
             'api_platform.doctrine_mongodb.odm.aggregation_extension.order',
-            'api_platform.doctrine_mongodb.odm.metadata.property.identifier_metadata_factory',
         ];
 
         $aliases = [