diff --git a/typo3/sysext/backend/Classes/Http/RouteDispatcher.php b/typo3/sysext/backend/Classes/Http/RouteDispatcher.php
index 070202951586fd55e2b2b696897b23f129c176d5..c63e94c998d30ad570bfd1823ccdffda25f30996 100644
--- a/typo3/sysext/backend/Classes/Http/RouteDispatcher.php
+++ b/typo3/sysext/backend/Classes/Http/RouteDispatcher.php
@@ -22,7 +22,6 @@ use TYPO3\CMS\Backend\Routing\Router;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\FormProtection\FormProtectionFactory;
 use TYPO3\CMS\Core\Http\Dispatcher;
-use TYPO3\CMS\Core\Http\DispatcherInterface;
 use TYPO3\CMS\Core\Type\Bitmask\Permission;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
@@ -30,7 +29,7 @@ use TYPO3\CMS\Core\Utility\MathUtility;
 /**
  * Dispatcher which resolves a route to call a controller and method (but also a callable)
  */
-class RouteDispatcher extends Dispatcher implements DispatcherInterface
+class RouteDispatcher extends Dispatcher
 {
     /**
      * Main method to resolve the route and checks the target of the route, and tries to call it.
diff --git a/typo3/sysext/backend/Classes/Template/Components/Buttons/InputButton.php b/typo3/sysext/backend/Classes/Template/Components/Buttons/InputButton.php
index b014a1e235cb1cb3c2c91ddb4300403382324252..1703df20c3a1aada5638a195b06dc4de052eb574 100644
--- a/typo3/sysext/backend/Classes/Template/Components/Buttons/InputButton.php
+++ b/typo3/sysext/backend/Classes/Template/Components/Buttons/InputButton.php
@@ -33,7 +33,7 @@ namespace TYPO3\CMS\Backend\Template\Components\Buttons;
  *      ->setTitle('Save');
  * $buttonBar->addButton($saveButton, ButtonBar::BUTTON_POSITION_LEFT, 1);
  */
-class InputButton extends AbstractButton implements ButtonInterface
+class InputButton extends AbstractButton
 {
     /**
      * Name Attribute of the button
diff --git a/typo3/sysext/backend/Classes/Template/Components/Buttons/LinkButton.php b/typo3/sysext/backend/Classes/Template/Components/Buttons/LinkButton.php
index 46e985592ae2c95128e6d2d954e4a88616acb20f..06c9828815623adf5f72081eeae7b535bf07da0d 100644
--- a/typo3/sysext/backend/Classes/Template/Components/Buttons/LinkButton.php
+++ b/typo3/sysext/backend/Classes/Template/Components/Buttons/LinkButton.php
@@ -32,7 +32,7 @@ namespace TYPO3\CMS\Backend\Template\Components\Buttons;
  *      ->setTitle('Save');
  * $buttonBar->addButton($saveButton, ButtonBar::BUTTON_POSITION_LEFT, 1);
  */
-class LinkButton extends AbstractButton implements ButtonInterface
+class LinkButton extends AbstractButton
 {
     /**
      * HREF attribute of the link
diff --git a/typo3/sysext/backend/Classes/Template/Components/Buttons/SplitButton.php b/typo3/sysext/backend/Classes/Template/Components/Buttons/SplitButton.php
index 71f3d8ec046ae21f7f2f904dddab64c953216946..28310fde5491adec4e2bc012c5f4d23336e7cb06 100644
--- a/typo3/sysext/backend/Classes/Template/Components/Buttons/SplitButton.php
+++ b/typo3/sysext/backend/Classes/Template/Components/Buttons/SplitButton.php
@@ -47,7 +47,7 @@ namespace TYPO3\CMS\Backend\Template\Components\Buttons;
  *      ->addItem($saveAndCloseButton)
  *      ->addItem($saveAndShowPageButton);
  */
-class SplitButton extends AbstractButton implements ButtonInterface
+class SplitButton extends AbstractButton
 {
     /**
      * Internal var that determines whether the split button has received any primary
diff --git a/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php b/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php
index 044d7b55f9f6bed816c2f696f223b68bdc1639fa..60038ad85ad3fc2c5cab16c9098b81bb3c17bfab 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php
@@ -24,7 +24,7 @@ use TYPO3\CMS\Core\Utility\StringUtility;
  * This file is a backport from FLOW3
  * @api
  */
-class FileBackend extends \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend implements \TYPO3\CMS\Core\Cache\Backend\PhpCapableBackendInterface, \TYPO3\CMS\Core\Cache\Backend\FreezableBackendInterface, \TYPO3\CMS\Core\Cache\Backend\TaggableBackendInterface
+class FileBackend extends \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend implements \TYPO3\CMS\Core\Cache\Backend\FreezableBackendInterface, \TYPO3\CMS\Core\Cache\Backend\TaggableBackendInterface
 {
     const SEPARATOR = '^';
     const EXPIRYTIME_FORMAT = 'YmdHis';
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/FileConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/FileConverter.php
index 868a16c6e76b20511662907826b65afc0279b94a..a418dce27b594fdb279231b1e1b1068ce71025f1 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/FileConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/FileConverter.php
@@ -19,7 +19,7 @@ namespace TYPO3\CMS\Extbase\Property\TypeConverter;
  *
  * @api experimental! This class is experimental and subject to change!
  */
-class FileConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\AbstractFileFolderConverter implements \TYPO3\CMS\Core\SingletonInterface
+class FileConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\AbstractFileFolderConverter
 {
     /**
      * @var array<string>
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/FileReferenceConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/FileReferenceConverter.php
index 6439c40a7be9fec9b68bb36c03cedcd571ca9fe0..67d0565fb74c67f3c77e2262bcb8938638a4f70b 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/FileReferenceConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/FileReferenceConverter.php
@@ -19,7 +19,7 @@ namespace TYPO3\CMS\Extbase\Property\TypeConverter;
  *
  * @api experimental! This class is experimental and subject to change!
  */
-class FileReferenceConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\AbstractFileFolderConverter implements \TYPO3\CMS\Core\SingletonInterface
+class FileReferenceConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\AbstractFileFolderConverter
 {
     /**
      * @var array<string>
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/FolderBasedFileCollectionConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/FolderBasedFileCollectionConverter.php
index 1f69ef119836ef37bb7c2ddc7ec375098e5aad35..9038fdda3568da6dc62e329211409ba23de9f76d 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/FolderBasedFileCollectionConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/FolderBasedFileCollectionConverter.php
@@ -19,7 +19,7 @@ namespace TYPO3\CMS\Extbase\Property\TypeConverter;
  *
  * @api experimental! This class is experimental and subject to change!
  */
-class FolderBasedFileCollectionConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\AbstractFileCollectionConverter implements \TYPO3\CMS\Core\SingletonInterface
+class FolderBasedFileCollectionConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\AbstractFileCollectionConverter
 {
     /**
      * @var array<string>
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/FolderConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/FolderConverter.php
index 71c5e600d236304fbad6aa9a1a7db93830b965c3..743c9ab17f59465aa0bc7ed6d3cabd30f5ad1847 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/FolderConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/FolderConverter.php
@@ -19,7 +19,7 @@ namespace TYPO3\CMS\Extbase\Property\TypeConverter;
  *
  * @api experimental! This class is experimental and subject to change!
  */
-class FolderConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\AbstractFileFolderConverter implements \TYPO3\CMS\Core\SingletonInterface
+class FolderConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\AbstractFileFolderConverter
 {
     /**
      * @var array<string>
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/IntegerConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/IntegerConverter.php
index 1f2cc59c6a02aee47c6fb02687114a1ba3d35f74..302308da9733b13ab8beb4564f8e61effbf2bc3b 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/IntegerConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/IntegerConverter.php
@@ -25,7 +25,7 @@ namespace TYPO3\CMS\Extbase\Property\TypeConverter;
  *
  * @api
  */
-class IntegerConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\AbstractTypeConverter implements \TYPO3\CMS\Core\SingletonInterface
+class IntegerConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\AbstractTypeConverter
 {
     /**
      * @var array<string>
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/ObjectConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/ObjectConverter.php
index badf8bcaff959bb91413c9080174884ed8bce73f..005b39b07bcef8bdf2f57fa412554726fd2dd10a 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/ObjectConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/ObjectConverter.php
@@ -25,7 +25,7 @@ namespace TYPO3\CMS\Extbase\Property\TypeConverter;
  *
  * @api
  */
-class ObjectConverter extends AbstractTypeConverter implements \TYPO3\CMS\Core\SingletonInterface
+class ObjectConverter extends AbstractTypeConverter
 {
     /**
      * @var int
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/StaticFileCollectionConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/StaticFileCollectionConverter.php
index 3b57fd6ea48a36ee605545e24413b07bb1ff32a8..eadea4527b6f15464be293c18d0d0841576e4131 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/StaticFileCollectionConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/StaticFileCollectionConverter.php
@@ -19,7 +19,7 @@ namespace TYPO3\CMS\Extbase\Property\TypeConverter;
  *
  * @api experimental! This class is experimental and subject to change!
  */
-class StaticFileCollectionConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\AbstractFileCollectionConverter implements \TYPO3\CMS\Core\SingletonInterface
+class StaticFileCollectionConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\AbstractFileCollectionConverter
 {
     /**
      * @var array<string>
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/StringConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/StringConverter.php
index 49fb5776373219cdee8713b8c2c1ed2c1d4e1536..d147b13767399ad64657fbf7952ebae1074f826e 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/StringConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/StringConverter.php
@@ -25,7 +25,7 @@ namespace TYPO3\CMS\Extbase\Property\TypeConverter;
  *
  * @api
  */
-class StringConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\AbstractTypeConverter implements \TYPO3\CMS\Core\SingletonInterface
+class StringConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\AbstractTypeConverter
 {
     /**
      * @var array<string>
diff --git a/typo3/sysext/form/Classes/Domain/Renderer/FluidFormRenderer.php b/typo3/sysext/form/Classes/Domain/Renderer/FluidFormRenderer.php
index 5633fddefa5937f6a1a6befd84a63ecea32f778d..3f5b7cc1d1066d94ea2a0a23e0c3c80716f36ea1 100644
--- a/typo3/sysext/form/Classes/Domain/Renderer/FluidFormRenderer.php
+++ b/typo3/sysext/form/Classes/Domain/Renderer/FluidFormRenderer.php
@@ -120,7 +120,7 @@ use TYPO3\CMS\Form\ViewHelpers\RenderRenderableViewHelper;
  * **This class is NOT meant to be sub classed by developers.**
  * @internal
  */
-class FluidFormRenderer extends AbstractElementRenderer implements RendererInterface
+class FluidFormRenderer extends AbstractElementRenderer
 {
 
     /**
diff --git a/typo3/sysext/frontend/Classes/AdminPanel/CacheModule.php b/typo3/sysext/frontend/Classes/AdminPanel/CacheModule.php
index d1d1507a0bd9de11f1f2a1e7d4fa33e90bf6b2e3..2e8326e33ca3c3dfb905c803797a755b71446732 100644
--- a/typo3/sysext/frontend/Classes/AdminPanel/CacheModule.php
+++ b/typo3/sysext/frontend/Classes/AdminPanel/CacheModule.php
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 namespace TYPO3\CMS\Frontend\AdminPanel;
 
-class CacheModule extends AbstractModule implements AdminPanelModuleInterface
+class CacheModule extends AbstractModule
 {
     /**
      * Creates the content for the "cache" section ("module") of the Admin Panel
diff --git a/typo3/sysext/frontend/Classes/AdminPanel/EditModule.php b/typo3/sysext/frontend/Classes/AdminPanel/EditModule.php
index 343dffb61980b9b40cca07f7af7adf575d070fe3..a8939a5d9d20db343080f6ab54a27e0149a3c832 100644
--- a/typo3/sysext/frontend/Classes/AdminPanel/EditModule.php
+++ b/typo3/sysext/frontend/Classes/AdminPanel/EditModule.php
@@ -24,7 +24,7 @@ use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 /**
  * Admin Panel Edit Module
  */
-class EditModule extends AbstractModule implements AdminPanelModuleInterface
+class EditModule extends AbstractModule
 {
     /**
      * Creates the content for the "edit" section ("module") of the Admin Panel
diff --git a/typo3/sysext/frontend/Classes/AdminPanel/InfoModule.php b/typo3/sysext/frontend/Classes/AdminPanel/InfoModule.php
index 3a7f435c9b2507eadf9b9b255a0be9177d9f7a5a..5fed7b4a455eb164cc549e3ce4b99d08b4a87002 100644
--- a/typo3/sysext/frontend/Classes/AdminPanel/InfoModule.php
+++ b/typo3/sysext/frontend/Classes/AdminPanel/InfoModule.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 /**
  * Admin Panel Info Module
  */
-class InfoModule extends AbstractModule implements AdminPanelModuleInterface
+class InfoModule extends AbstractModule
 {
     /**
      * Creates the content for the "info" section ("module") of the Admin Panel
diff --git a/typo3/sysext/frontend/Classes/AdminPanel/PreviewModule.php b/typo3/sysext/frontend/Classes/AdminPanel/PreviewModule.php
index 15c54150d7f79cda8cf7f8dc206795aa74d2ed0d..d8c1c195adb0de728332de8a28153192f251a379 100644
--- a/typo3/sysext/frontend/Classes/AdminPanel/PreviewModule.php
+++ b/typo3/sysext/frontend/Classes/AdminPanel/PreviewModule.php
@@ -24,7 +24,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Admin Panel Preview Module
  */
-class PreviewModule extends AbstractModule implements AdminPanelModuleInterface
+class PreviewModule extends AbstractModule
 {
 
     /**
diff --git a/typo3/sysext/frontend/Classes/AdminPanel/TsDebugModule.php b/typo3/sysext/frontend/Classes/AdminPanel/TsDebugModule.php
index a622589469634b104e736ec1b2c9a5fe15c8bae7..b32a0db6f53074f1dbaaa7e4712878d1cdeb6384 100644
--- a/typo3/sysext/frontend/Classes/AdminPanel/TsDebugModule.php
+++ b/typo3/sysext/frontend/Classes/AdminPanel/TsDebugModule.php
@@ -22,7 +22,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Admin Panel TypoScript Debug Module
  */
-class TsDebugModule extends AbstractModule implements AdminPanelModuleInterface
+class TsDebugModule extends AbstractModule
 {
 
     /**
diff --git a/typo3/sysext/install/Classes/Configuration/Image/GraphicsMagickPreset.php b/typo3/sysext/install/Classes/Configuration/Image/GraphicsMagickPreset.php
index 6b801f16dc28825b2588aff58d0996de07d66d64..751781c05e0e829fda9e8c4fbd2602dd864af17e 100644
--- a/typo3/sysext/install/Classes/Configuration/Image/GraphicsMagickPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Image/GraphicsMagickPreset.php
@@ -14,12 +14,10 @@ namespace TYPO3\CMS\Install\Configuration\Image;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Install\Configuration;
-
 /**
  * Preset for GraphicsMagick
  */
-class GraphicsMagickPreset extends AbstractImagePreset implements Configuration\PresetInterface
+class GraphicsMagickPreset extends AbstractImagePreset
 {
     /**
      * @var string Name of preset
diff --git a/typo3/sysext/install/Classes/Configuration/Image/ImageMagick6Preset.php b/typo3/sysext/install/Classes/Configuration/Image/ImageMagick6Preset.php
index c6338ec2303550ea6b8fd537f1adfb09dfa56e9f..2e7dfff1598ed44713991cc0743d129f2e5a5d24 100644
--- a/typo3/sysext/install/Classes/Configuration/Image/ImageMagick6Preset.php
+++ b/typo3/sysext/install/Classes/Configuration/Image/ImageMagick6Preset.php
@@ -14,12 +14,10 @@ namespace TYPO3\CMS\Install\Configuration\Image;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Install\Configuration;
-
 /**
  * Preset for ImageMagick version 6 or higher
  */
-class ImageMagick6Preset extends AbstractImagePreset implements Configuration\PresetInterface
+class ImageMagick6Preset extends AbstractImagePreset
 {
     /**
      * @var string Name of preset
diff --git a/typo3/sysext/install/Classes/ExtensionScanner/Php/Matcher/MethodArgumentDroppedMatcher.php b/typo3/sysext/install/Classes/ExtensionScanner/Php/Matcher/MethodArgumentDroppedMatcher.php
index e6157b30253858711afcc94589cae5c575c12f35..0f9adb309b931446002b6d19a46a0d3e1f058920 100644
--- a/typo3/sysext/install/Classes/ExtensionScanner/Php/Matcher/MethodArgumentDroppedMatcher.php
+++ b/typo3/sysext/install/Classes/ExtensionScanner/Php/Matcher/MethodArgumentDroppedMatcher.php
@@ -17,7 +17,6 @@ namespace TYPO3\CMS\Install\ExtensionScanner\Php\Matcher;
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\MethodCall;
-use TYPO3\CMS\Install\ExtensionScanner\CodeScannerInterface;
 
 /**
  * Find usages of method calls which changed signature and dropped arguments,
@@ -25,7 +24,7 @@ use TYPO3\CMS\Install\ExtensionScanner\CodeScannerInterface;
  * This is a "weak" match since we're just testing for method name
  * but not connected class.
  */
-class MethodArgumentDroppedMatcher extends AbstractCoreMatcher implements CodeScannerInterface
+class MethodArgumentDroppedMatcher extends AbstractCoreMatcher
 {
     /**
      * Prepare $this->flatMatcherDefinitions once and validate config
diff --git a/typo3/sysext/install/Classes/ExtensionScanner/Php/Matcher/MethodArgumentDroppedStaticMatcher.php b/typo3/sysext/install/Classes/ExtensionScanner/Php/Matcher/MethodArgumentDroppedStaticMatcher.php
index fffbbdf4a1558a80b8022cf30b98a9852feaf403..87fdc36bff2df6eba60a79d84b35996e8cc237dc 100644
--- a/typo3/sysext/install/Classes/ExtensionScanner/Php/Matcher/MethodArgumentDroppedStaticMatcher.php
+++ b/typo3/sysext/install/Classes/ExtensionScanner/Php/Matcher/MethodArgumentDroppedStaticMatcher.php
@@ -19,13 +19,12 @@ use PhpParser\Node;
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Name\FullyQualified;
-use TYPO3\CMS\Install\ExtensionScanner\CodeScannerInterface;
 
 /**
  * Find usages of static method calls which were removed / deprecated.
  * This is a "strong" match if class name is given and "weak" if not.
  */
-class MethodArgumentDroppedStaticMatcher extends AbstractCoreMatcher implements CodeScannerInterface
+class MethodArgumentDroppedStaticMatcher extends AbstractCoreMatcher
 {
     /**
      * Prepare $this->flatMatcherDefinitions once and validate config
diff --git a/typo3/sysext/install/Classes/ExtensionScanner/Php/Matcher/MethodArgumentRequiredMatcher.php b/typo3/sysext/install/Classes/ExtensionScanner/Php/Matcher/MethodArgumentRequiredMatcher.php
index 1756348acf7ec7ccc27742d4f50c17aa9295a543..5a7aa0710c0deb21b34e32125edc29cde6fb0c22 100644
--- a/typo3/sysext/install/Classes/ExtensionScanner/Php/Matcher/MethodArgumentRequiredMatcher.php
+++ b/typo3/sysext/install/Classes/ExtensionScanner/Php/Matcher/MethodArgumentRequiredMatcher.php
@@ -17,14 +17,13 @@ namespace TYPO3\CMS\Install\ExtensionScanner\Php\Matcher;
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\MethodCall;
-use TYPO3\CMS\Install\ExtensionScanner\CodeScannerInterface;
 
 /**
  * Find usages of method calls which changed signature and added required arguments.
  * This is a "weak" match since we're just testing for method name
  * but not connected class.
  */
-class MethodArgumentRequiredMatcher extends AbstractCoreMatcher implements CodeScannerInterface
+class MethodArgumentRequiredMatcher extends AbstractCoreMatcher
 {
     /**
      * Prepare $this->flatMatcherDefinitions once and validate config
diff --git a/typo3/sysext/install/Classes/ExtensionScanner/Php/Matcher/MethodArgumentRequiredStaticMatcher.php b/typo3/sysext/install/Classes/ExtensionScanner/Php/Matcher/MethodArgumentRequiredStaticMatcher.php
index 3525c413b298c46847886fb5aafa37a340e86279..11b3b4117d39de4feac1a95360790ee8678d0f5e 100644
--- a/typo3/sysext/install/Classes/ExtensionScanner/Php/Matcher/MethodArgumentRequiredStaticMatcher.php
+++ b/typo3/sysext/install/Classes/ExtensionScanner/Php/Matcher/MethodArgumentRequiredStaticMatcher.php
@@ -19,13 +19,12 @@ use PhpParser\Node;
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Name\FullyQualified;
-use TYPO3\CMS\Install\ExtensionScanner\CodeScannerInterface;
 
 /**
  * Find usages of static method calls which gained new mandatory arguments.
  * This is a "strong" match if class name is given and "weak" if not.
  */
-class MethodArgumentRequiredStaticMatcher extends AbstractCoreMatcher implements CodeScannerInterface
+class MethodArgumentRequiredStaticMatcher extends AbstractCoreMatcher
 {
     /**
      * Prepare $this->flatMatcherDefinitions once and validate config
diff --git a/typo3/sysext/install/Classes/ExtensionScanner/Php/Matcher/MethodArgumentUnusedMatcher.php b/typo3/sysext/install/Classes/ExtensionScanner/Php/Matcher/MethodArgumentUnusedMatcher.php
index 7cca30b84275619a19ddcbc4f8266fca5b6c351c..f07fd29891af0021399693e3ed9c98e8f9358fd4 100644
--- a/typo3/sysext/install/Classes/ExtensionScanner/Php/Matcher/MethodArgumentUnusedMatcher.php
+++ b/typo3/sysext/install/Classes/ExtensionScanner/Php/Matcher/MethodArgumentUnusedMatcher.php
@@ -18,7 +18,6 @@ namespace TYPO3\CMS\Install\ExtensionScanner\Php\Matcher;
 use PhpParser\Node;
 use PhpParser\Node\Expr\ConstFetch;
 use PhpParser\Node\Expr\MethodCall;
-use TYPO3\CMS\Install\ExtensionScanner\CodeScannerInterface;
 
 /**
  * Match method usages where arguments "in between" are unused but not given as "null":
@@ -27,7 +26,7 @@ use TYPO3\CMS\Install\ExtensionScanner\CodeScannerInterface;
  * but called with:
  * ->foo('arg1', 'notNull', null, 'arg4');
  */
-class MethodArgumentUnusedMatcher extends AbstractCoreMatcher implements CodeScannerInterface
+class MethodArgumentUnusedMatcher extends AbstractCoreMatcher
 {
     /**
      * Prepare $this->flatMatcherDefinitions once and validate config