diff --git a/Classes/Helper/ReplacerHelper.php b/Classes/Helper/ReplacerHelper.php
index 7a0c6da..ca6b203 100644
--- a/Classes/Helper/ReplacerHelper.php
+++ b/Classes/Helper/ReplacerHelper.php
@@ -14,6 +14,7 @@
 use JWeiland\Replacer\Configuration\ReplaceConfiguration;
 use JWeiland\Replacer\Enumeration\ConfigurationTypeEnumeration;
 use Psr\Http\Message\ServerRequestInterface;
+use TYPO3\CMS\Core\Http\ServerRequest;
 use TYPO3\CMS\Core\Utility\ArrayUtility;
 use TYPO3\CMS\Core\Utility\Exception\MissingArrayPathException;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -23,14 +24,7 @@
  */
 class ReplacerHelper
 {
-    protected TypoScriptHelper $typoScriptHelper;
-
-    protected ServerRequestInterface $request;
-
-    public function __construct(TypoScriptHelper $typoScriptHelper)
-    {
-        $this->typoScriptHelper = $typoScriptHelper;
-    }
+    public function __construct(protected TypoScriptHelper $typoScriptHelper) {}
 
     /**
      * Search and replace text from $contentToReplace
diff --git a/Classes/Helper/TypoScriptHelper.php b/Classes/Helper/TypoScriptHelper.php
index a036925..ca56108 100644
--- a/Classes/Helper/TypoScriptHelper.php
+++ b/Classes/Helper/TypoScriptHelper.php
@@ -12,6 +12,8 @@
 namespace JWeiland\Replacer\Helper;
 
 use Psr\Http\Message\ServerRequestInterface;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 
 class TypoScriptHelper
 {
diff --git a/Classes/Middleware/ReplaceContentMiddleware.php b/Classes/Middleware/ReplaceContentMiddleware.php
index b26d217..d10fb29 100644
--- a/Classes/Middleware/ReplaceContentMiddleware.php
+++ b/Classes/Middleware/ReplaceContentMiddleware.php
@@ -28,12 +28,7 @@
  */
 class ReplaceContentMiddleware implements MiddlewareInterface
 {
-    private ReplacerHelper $replacerHelper;
-
-    public function __construct(ReplacerHelper $replacerHelper)
-    {
-        $this->replacerHelper = $replacerHelper;
-    }
+    public function __construct(protected ReplacerHelper $replacerHelper) {}
 
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
@@ -55,10 +50,7 @@ protected function getContentObjectRenderer(ServerRequestInterface $request): Co
         $tsfeController = $request->getAttribute('frontend.controller');
 
         // Create a new instance of ContentObjectRenderer
-        $cObj = GeneralUtility::makeInstance(ContentObjectRenderer::class);
-
-        // Associate the ContentObjectRenderer with the TypoScriptFrontendController
-        $cObj->setFrontendController($tsfeController);
+        $cObj = GeneralUtility::makeInstance(ContentObjectRenderer::class, $tsfeController);
 
         // Set the request in the ContentObjectRenderer
         $cObj->setRequest($request);