diff --git a/typo3/sysext/core/Migrations/Code/LegacyClassesForIde.php b/typo3/sysext/core/Migrations/Code/LegacyClassesForIde.php
index 0be7feb2d52deb3d93a11aba593f9677136fdcec..f3f6a6b92b01bf68df7505851db45647043263ec 100644
--- a/typo3/sysext/core/Migrations/Code/LegacyClassesForIde.php
+++ b/typo3/sysext/core/Migrations/Code/LegacyClassesForIde.php
@@ -2996,16 +2996,6 @@ class Tx_Extbase_SignalSlot_Exception_InvalidSlotException extends \TYPO3\CMS\Ex
  */
 class Tx_Extbase_Utility_Arrays extends \TYPO3\CMS\Extbase\Utility\ArrayUtility {}
 
-/**
- * @deprecated since 6.0 will be removed in 7.0
- */
-class Tx_Extbase_Utility_Cache extends \TYPO3\CMS\Extbase\Utility\CacheUtility {}
-
-/**
- * @deprecated since 6.0 will be removed in 7.0
- */
-class Tx_Extbase_Utility_ClassLoader extends \TYPO3\CMS\Extbase\Utility\ClassLoaderUtility {}
-
 /**
  * @deprecated since 6.0 will be removed in 7.0
  */
@@ -3031,16 +3021,6 @@ class Tx_Extbase_Utility_FrontendSimulator extends \TYPO3\CMS\Extbase\Utility\Fr
  */
 class Tx_Extbase_Utility_Localization extends \TYPO3\CMS\Extbase\Utility\LocalizationUtility {}
 
-/**
- * @deprecated since 6.0 will be removed in 7.0
- */
-class Tx_Extbase_Utility_TypeHandling extends \TYPO3\CMS\Extbase\Utility\TypeHandlingUtility {}
-
-/**
- * @deprecated since 6.0 will be removed in 7.0
- */
-class Tx_Extbase_Utility_TypoScript extends \TYPO3\CMS\Extbase\Utility\TypoScriptUtility {}
-
 /**
  * @deprecated since 6.0 will be removed in 7.0
  */
diff --git a/typo3/sysext/extbase b/typo3/sysext/extbase
index ff9a2b66eba1aa26cce3a183d6f0227469531029..ca9040cbb90111221c87d2812a63277f8d969f34 160000
--- a/typo3/sysext/extbase
+++ b/typo3/sysext/extbase
@@ -1 +1 @@
-Subproject commit ff9a2b66eba1aa26cce3a183d6f0227469531029
+Subproject commit ca9040cbb90111221c87d2812a63277f8d969f34