diff --git a/composer.json b/composer.json
index a0e4ba430c54aec8882c6ca68b4bb21c390f7ac2..48df88792c1a59661068d0a23dd74edd349fed6a 100644
--- a/composer.json
+++ b/composer.json
@@ -87,7 +87,6 @@
 			"always-add-alias-loader": true,
 			"class-alias-maps": [
 				"typo3/sysext/adminpanel/Migrations/Code/ClassAliasMap.php",
-				"typo3/sysext/core/Migrations/Code/ClassAliasMap.php",
 				"typo3/sysext/extbase/Migrations/Code/ClassAliasMap.php",
 				"typo3/sysext/fluid/Migrations/Code/ClassAliasMap.php"
 			]
diff --git a/composer.lock b/composer.lock
index 21df472c8ccd5520b6d20828015d3a8dc092aba5..de9dcc241eab78c93baea1ef624fc6c554ee408d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f96fc721fdf08c347a435067d454a775",
+    "content-hash": "b2db1b9d3a8ca65d71ee6629ec675636",
     "packages": [
         {
             "name": "cogpowered/finediff",
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-87193-DeprecatedFunctionalityRemoved.rst b/typo3/sysext/core/Documentation/Changelog/master/Breaking-87193-DeprecatedFunctionalityRemoved.rst
index 65ad9e43f1f057a8b06efc745b806329b926e37b..346745e40e0e6cd6632769a99c5c21b1422d3a07 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Breaking-87193-DeprecatedFunctionalityRemoved.rst
+++ b/typo3/sysext/core/Documentation/Changelog/master/Breaking-87193-DeprecatedFunctionalityRemoved.rst
@@ -45,10 +45,16 @@ The following PHP class aliases that have been previously deprecated for v9 have
 
 * :php:`TYPO3\CMS\Backend\AjaxLoginHandler`
 * :php:`TYPO3\CMS\Backend\Form\Wizard\ImageManipulationWizard`
+* :php:`TYPO3\CMS\Core\History\RecordHistory`
+* :php:`TYPO3\CMS\Core\IO\PharStreamWrapper`
+* :php:`TYPO3\CMS\Core\IO\PharStreamWrapperException`
+* :php:`TYPO3\CMS\Core\Tree\TableConfiguration\ExtJsArrayTreeRenderer`
+* :php:`TYPO3\CMS\ContextHelp\Controller\ContextHelpAjaxController`
 * :php:`TYPO3\CMS\Cshmanual\Domain\Repository\TableManualRepository`
 * :php:`TYPO3\CMS\Frontend\Controller\PageInformationController`
 * :php:`TYPO3\CMS\Frontend\Controller\TranslationStatusController`
 * :php:`TYPO3\CMS\InfoPagetsconfig\Controller\InfoPageTyposcriptConfigController`
+* :php:`TYPO3\CMS\Lang\LanguageService`
 * :php:`TYPO3\CMS\Lowlevel\Command\WorkspaceVersionRecordsCommand`
 * :php:`TYPO3\CMS\Lowlevel\View\ConfigurationView`
 * :php:`TYPO3\CMS\Recordlist\RecordList`
@@ -67,6 +73,8 @@ The following PHP class aliases that have been previously deprecated for v9 have
 * :php:`TYPO3\CMS\Saltedpasswords\SaltedPasswordsService`
 * :php:`TYPO3\CMS\Saltedpasswords\Utility\ExensionManagerConfigurationUtility`
 * :php:`TYPO3\CMS\Saltedpasswords\Utility\SaltedPasswordsUtility`
+* :php:`TYPO3\CMS\Sv\AbstractAuthenticationService`
+* :php:`TYPO3\CMS\Sv\AuthenticationService`
 * :php:`TYPO3\CMS\Sv\Report\ServicesListReport`
 * :php:`TYPO3\CMS\T3editor\CodeCompletion`
 * :php:`TYPO3\CMS\T3editor\TypoScriptReferenceLoader`
diff --git a/typo3/sysext/core/Migrations/Code/ClassAliasMap.php b/typo3/sysext/core/Migrations/Code/ClassAliasMap.php
deleted file mode 100644
index 7243acf82ab700ec4f46306f672a9ee65f639042..0000000000000000000000000000000000000000
--- a/typo3/sysext/core/Migrations/Code/ClassAliasMap.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-return [
-    'TYPO3\\CMS\\Lang\\LanguageService' => \TYPO3\CMS\Core\Localization\LanguageService::class,
-    'TYPO3\\CMS\\ContextHelp\\Controller\\ContextHelpAjaxController' => \TYPO3\CMS\Backend\Controller\ContextHelpAjaxController::class,
-    'TYPO3\\CMS\\Sv\\AbstractAuthenticationService' => \TYPO3\CMS\Core\Authentication\AbstractAuthenticationService::class,
-    'TYPO3\\CMS\\Sv\\AuthenticationService' => \TYPO3\CMS\Core\Authentication\AuthenticationService::class,
-    'TYPO3\\CMS\\Core\\IO\\PharStreamWrapper' => \TYPO3\PharStreamWrapper\PharStreamWrapper::class,
-    'TYPO3\\CMS\\Core\\IO\\PharStreamWrapperException' => \TYPO3\PharStreamWrapper\Exception::class,
-    'TYPO3\\CMS\\Core\\Tree\\TableConfiguration\\ExtJsArrayTreeRenderer' => \TYPO3\CMS\Core\Tree\TableConfiguration\ArrayTreeRenderer::class,
-    'TYPO3\\CMS\\Core\\History\\RecordHistory' => \TYPO3\CMS\Core\DataHandling\History\RecordHistoryStore::class,
-];
diff --git a/typo3/sysext/core/Migrations/Code/LegacyClassesForIde.php b/typo3/sysext/core/Migrations/Code/LegacyClassesForIde.php
deleted file mode 100644
index 0e31e02774d64bbba9098d2daa477f159f36f81a..0000000000000000000000000000000000000000
--- a/typo3/sysext/core/Migrations/Code/LegacyClassesForIde.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-namespace {
-    die('Access denied');
-}
-
-namespace TYPO3\CMS\Lang {
-    class LanguageService extends \TYPO3\CMS\Core\Localization\LanguageService
-    {
-    }
-}
-
-namespace TYPO3\CMS\ContextHelp\Controller {
-    class ContextHelpAjaxController extends \TYPO3\CMS\Backend\Controller\ContextHelpAjaxController
-    {
-    }
-}
-
-namespace TYPO3\CMS\Sv {
-    class AbstractAuthenticationService extends \TYPO3\CMS\Core\Authentication\AbstractAuthenticationService
-    {
-    }
-    class AuthenticationService extends \TYPO3\CMS\Core\Authentication\AuthenticationService
-    {
-    }
-}
diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json
index 6fb2e1ee135a73367695c71ac0a5aecaeaaf406a..75b484d6e38d2a0e6d6b0f810db0ea8277ed15ff 100644
--- a/typo3/sysext/core/composer.json
+++ b/typo3/sysext/core/composer.json
@@ -83,11 +83,6 @@
 				"partOfMinimalUsableSystem": true
 			},
 			"extension-key": "core"
-		},
-		"typo3/class-alias-loader": {
-			"class-alias-maps": [
-				"Migrations/Code/ClassAliasMap.php"
-			]
 		}
 	},
 	"autoload": {
diff --git a/typo3/sysext/install/Configuration/ExtensionScanner/Php/ClassNameMatcher.php b/typo3/sysext/install/Configuration/ExtensionScanner/Php/ClassNameMatcher.php
index 498c9467ae448cd075fb4b67abdf45f45b2770a9..7a1ee7a6bedf72d1eb1d2c0c46d9dbb6f25638ad 100644
--- a/typo3/sysext/install/Configuration/ExtensionScanner/Php/ClassNameMatcher.php
+++ b/typo3/sysext/install/Configuration/ExtensionScanner/Php/ClassNameMatcher.php
@@ -168,11 +168,13 @@ return [
     'TYPO3\CMS\Sv\AbstractAuthenticationService' => [
         'restFiles' => [
             'Breaking-81536-MoveOfServicesListReportFromSvToReports.rst',
+            'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
         ],
     ],
     'TYPO3\CMS\Sv\AuthenticationService' => [
         'restFiles' => [
             'Breaking-81536-MoveOfServicesListReportFromSvToReports.rst',
+            'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
         ],
     ],
     'TYPO3\CMS\Extbase\Configuration\Exception\ContainerIsLockedException' => [