diff --git a/Internal/Framework/Module/Setup/Bridge/TemplateBlockModuleSettingHandlerBridge.php b/Internal/Framework/Module/Setup/Bridge/TemplateBlockModuleSettingHandlerBridge.php
deleted file mode 100644
index c83ffd7..0000000
--- a/Internal/Framework/Module/Setup/Bridge/TemplateBlockModuleSettingHandlerBridge.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- * 
- * https://www.d3data.de
- *
- * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author    D3 Data Development - Daniel Seifert <info@shopmodule.com>
- * @link      https://www.oxidmodule.com
- */
-
-declare(strict_types=1);
-
-namespace D3\OxidServiceBridges\Internal\Framework\Module\Setup\Bridge;
-
-use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\DataObject\ModuleConfiguration;
-use OxidEsales\EshopCommunity\Internal\Framework\Module\Setup\Handler\TemplateBlockModuleSettingHandler;
-
-class TemplateBlockModuleSettingHandlerBridge implements TemplateBlockModuleSettingHandlerBridgeInterface
-{
-    /**
-     * @var TemplateBlockModuleSettingHandler
-     */
-    private $templateBlockModuleSettingHandlerService;
-
-    /**
-     * @param TemplateBlockModuleSettingHandler $templateBlockModuleSettingHandlerService
-     */
-    public function __construct(TemplateBlockModuleSettingHandler $templateBlockModuleSettingHandlerService)
-    {
-        $this->templateBlockModuleSettingHandlerService = $templateBlockModuleSettingHandlerService;
-    }
-
-    public function handleOnModuleActivation(ModuleConfiguration $configuration, int $shopId)
-    {
-        $this->templateBlockModuleSettingHandlerService->handleOnModuleActivation($configuration, $shopId);
-    }
-
-    public function handleOnModuleDeactivation(ModuleConfiguration $configuration, int $shopId)
-    {
-        $this->templateBlockModuleSettingHandlerService->handleOnModuleDeactivation($configuration, $shopId);
-    }
-}
-
diff --git a/Internal/Framework/Module/Setup/Bridge/TemplateBlockModuleSettingHandlerBridgeInterface.php b/Internal/Framework/Module/Setup/Bridge/TemplateBlockModuleSettingHandlerBridgeInterface.php
deleted file mode 100644
index 6aade69..0000000
--- a/Internal/Framework/Module/Setup/Bridge/TemplateBlockModuleSettingHandlerBridgeInterface.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- * 
- * https://www.d3data.de
- *
- * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author    D3 Data Development - Daniel Seifert <info@shopmodule.com>
- * @link      https://www.oxidmodule.com
- */
-
-declare(strict_types=1);
-
-namespace D3\OxidServiceBridges\Internal\Framework\Module\Setup\Bridge;
-
-use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\DataObject\ModuleConfiguration;
-
-interface TemplateBlockModuleSettingHandlerBridgeInterface
-{
-    public function handleOnModuleActivation(ModuleConfiguration $configuration, int $shopId);
-
-    public function handleOnModuleDeactivation(ModuleConfiguration $configuration, int $shopId);
-}
-
diff --git a/services.yaml b/services.yaml
index f799e87..e00d103 100644
--- a/services.yaml
+++ b/services.yaml
@@ -8,10 +8,3 @@ services:
 
   D3\OxidServiceBridges\Internal\Framework\Module\Path\ModulePathResolverBridgeInterface:
     class: D3\OxidServiceBridges\Internal\Framework\Module\Path\ModulePathResolverBridge
-
-  D3\OxidServiceBridges\Internal\Framework\Module\Setup\Bridge\TemplateBlockModuleSettingHandlerBridgeInterface:
-    class: D3\OxidServiceBridges\Internal\Framework\Module\Setup\Bridge\TemplateBlockModuleSettingHandlerBridge
-    public: true
-    arguments:
-      $templateBlockModuleSettingHandlerService: '@oxid_esales.module.setup.template_blocks_module_setting_handler'
-