diff --git a/Classes/Controller/CleanupController.php b/Classes/Controller/CleanupController.php
index 7de4986..9f45ac1 100644
--- a/Classes/Controller/CleanupController.php
+++ b/Classes/Controller/CleanupController.php
@@ -25,7 +25,7 @@
 use TYPO3\CMS\Core\Resource\ResourceStorage;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
-use TYPO3\CMS\Extbase\Mvc\View\ViewInterface;
+use TYPO3Fluid\Fluid\View\ViewInterface;
 use WebVision\WvFileCleanup\Domain\Repository\FileRepository;
 
 /**
diff --git a/Classes/Domain/Repository/FileRepository.php b/Classes/Domain/Repository/FileRepository.php
index 9d65d96..0b5b97c 100644
--- a/Classes/Domain/Repository/FileRepository.php
+++ b/Classes/Domain/Repository/FileRepository.php
@@ -7,6 +7,7 @@
 use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
 use TYPO3\CMS\Core\Database\Connection;
 use TYPO3\CMS\Core\Database\ConnectionPool;
+use TYPO3\CMS\Core\Imaging\IconFactory;
 use TYPO3\CMS\Core\Resource\Exception\ResourceDoesNotExistException;
 use TYPO3\CMS\Core\Resource\File;
 use TYPO3\CMS\Core\Resource\FileInterface;
@@ -46,7 +47,9 @@ class FileRepository implements SingletonInterface
      * @throws ExtensionConfigurationExtensionNotConfiguredException
      * @throws ExtensionConfigurationPathDoesNotExistException
      */
-    public function __construct()
+    public function __construct(
+        private readonly IconFactory $iconFactory
+    )
     {
         $this->connection = GeneralUtility::makeInstance(ConnectionPool::class);
         $this->fileCollectionService = GeneralUtility::makeInstance(FileCollectionService::class);
@@ -104,7 +107,7 @@ public function findUnusedFile(
         });
 
         foreach ($files as $file) {
-            $return[] = new FileFacade($file);
+            $return[] = new FileFacade($file, $this->iconFactory);
         }
 
         return $return;
diff --git a/Classes/FileFacade.php b/Classes/FileFacade.php
index 94935f4..e6a53d0 100644
--- a/Classes/FileFacade.php
+++ b/Classes/FileFacade.php
@@ -18,6 +18,7 @@
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Resource\FileInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
@@ -37,11 +38,6 @@ class FileFacade
      */
     protected static $lastReferenceTimestamps = [];
 
-    /**
-     * @var \TYPO3\CMS\Core\Resource\FileInterface
-     */
-    protected $resource;
-
     /**
      * @var \TYPO3\CMS\Core\Database\ConnectionPool
      */
@@ -53,13 +49,13 @@ class FileFacade
      */
     protected $databaseConnection;
 
-    /**
-     * @param \TYPO3\CMS\Core\Resource\FileInterface $resource
-     */
-    public function __construct(\TYPO3\CMS\Core\Resource\FileInterface $resource)
+    public function __construct(
+        private readonly FileInterface $resource,
+        private readonly IconFactory $iconFactory
+    )
     {
-        $this->resource = $resource;
-        $this->iconFactory = GeneralUtility::makeInstance(IconFactory::class);
+       # $this->resource = $resource;
+       # $this->iconFactory = GeneralUtility::makeInstance(IconFactory::class);
     }
 
     /**
@@ -72,7 +68,7 @@ public function getIcon()
     }
 
     /**
-     * @return \TYPO3\CMS\Core\Resource\FileInterface
+     * @return FileInterface
      */
     public function getResource()
     {
@@ -296,7 +292,7 @@ public function __call($method, $arguments)
 
     protected function initDatabaseConnection()
     {
-        $this->queryBuilder = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Database\ConnectionPool::class);
+           $this->queryBuilder = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Database\ConnectionPool::class);
     }
 
     /**