diff --git a/src/Module/DataType/ModuleDataType.php b/src/Module/DataType/ModuleDataType.php
index f3162f9..c1705aa 100644
--- a/src/Module/DataType/ModuleDataType.php
+++ b/src/Module/DataType/ModuleDataType.php
@@ -53,10 +53,4 @@ public function getEmail(): ?string
     {
         return $this->email;
     }
-
-    #[Field]
-    public function isActive(): bool
-    {
-        return $this->active;
-    }
 }
diff --git a/src/Theme/Infrastructure/ThemeListInfrastructureInterface.php b/src/Theme/Infrastructure/ThemeListInfrastructureInterface.php
index fed8d94..a7c85e5 100644
--- a/src/Theme/Infrastructure/ThemeListInfrastructureInterface.php
+++ b/src/Theme/Infrastructure/ThemeListInfrastructureInterface.php
@@ -7,13 +7,13 @@
 
 namespace OxidEsales\GraphQL\ConfigurationAccess\Theme\Infrastructure;
 
-use OxidEsales\GraphQL\ConfigurationAccess\Theme\DataType\ThemeDataType;
+use OxidEsales\Eshop\Core\Theme;
 use OxidEsales\GraphQL\ConfigurationAccess\Theme\Exception\ThemesNotFound;
 
 interface ThemeListInfrastructureInterface
 {
     /**
-     * @return array<ThemeDataType>
+     * @return array<Theme>
      * @throws ThemesNotFound
      */
     public function getThemes(): array;
diff --git a/src/Theme/Service/ThemeListService.php b/src/Theme/Service/ThemeListService.php
index 711cdd8..29f8716 100644
--- a/src/Theme/Service/ThemeListService.php
+++ b/src/Theme/Service/ThemeListService.php
@@ -28,7 +28,6 @@ public function getThemeList(ComponentFiltersInterface $filters): array
         $themesArray =  [];
         $themesList = $this->themeListInfrastructure->getThemes();
         foreach ($themesList as $theme) {
-            /** @var Theme $theme  */
             $themesArray[] = $this->themeDataTypeFactory->createFromCoreTheme(theme: $theme);
         }