diff --git a/Controller/Controller.php b/Controller/Controller.php
index 4ed09cd..2ec8a3e 100644
--- a/Controller/Controller.php
+++ b/Controller/Controller.php
@@ -15,7 +15,6 @@ declare(strict_types=1);
 namespace Modules\ItemManagement\Controller;
 
 use phpOMS\Module\ModuleAbstract;
-use phpOMS\Module\WebInterface;
 
 /**
  * ItemManagement controller class.
diff --git a/Models/ItemAttributeMapper.php b/Models/ItemAttributeMapper.php
index a3e5edf..ef0eaba 100644
--- a/Models/ItemAttributeMapper.php
+++ b/Models/ItemAttributeMapper.php
@@ -23,8 +23,6 @@ use phpOMS\DataStorage\Database\DataMapperAbstract;
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0
- *
- * @todo Do I really want to create a relation to the language mapper? It's not really needed right?
  */
 final class ItemAttributeMapper extends DataMapperAbstract
 {
diff --git a/Models/ItemAttributeTypeL11nMapper.php b/Models/ItemAttributeTypeL11nMapper.php
index e6b9533..165e618 100644
--- a/Models/ItemAttributeTypeL11nMapper.php
+++ b/Models/ItemAttributeTypeL11nMapper.php
@@ -24,8 +24,6 @@ use phpOMS\Localization\Defaults\LanguageMapper;
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0
- *
- * @todo Do I really want to create a relation to the language mapper? It's not really needed right?
  */
 final class ItemAttributeTypeL11nMapper extends DataMapperAbstract
 {
@@ -42,22 +40,6 @@ final class ItemAttributeTypeL11nMapper extends DataMapperAbstract
         'itemmgmt_attr_type_l11n_lang'      => ['name' => 'itemmgmt_attr_type_l11n_lang', 'type' => 'string', 'internal' => 'language'],
     ];
 
-    /**
-     * Has one relation.
-     *
-     * @var array<string, array{mapper:string, external:string, by?:string, column?:string, conditional?:bool}>
-     * @since 1.0.0
-     */
-    protected static array $ownsOne = [
-        'language' => [
-            'mapper'            => LanguageMapper::class,
-            'external'          => 'itemmgmt_attr_type_l11n_lang',
-            'by'                => 'code2',
-            'column'            => 'code2',
-            'conditional'       => true,
-        ],
-    ];
-
     /**
      * Primary table.
      *
diff --git a/Models/ItemAttributeValueMapper.php b/Models/ItemAttributeValueMapper.php
index aefb9e3..04ad16d 100644
--- a/Models/ItemAttributeValueMapper.php
+++ b/Models/ItemAttributeValueMapper.php
@@ -25,8 +25,6 @@ use phpOMS\Localization\Defaults\LanguageMapper;
  * @license OMS License 1.0
  * @link    https:   //orange-management.org
  * @since   1.0.0
- *
- * @todo Do I really want to create a relation to the language mapper? It's not really needed right?
  */
 final class ItemAttributeValueMapper extends DataMapperAbstract
 {
@@ -48,29 +46,6 @@ final class ItemAttributeValueMapper extends DataMapperAbstract
         'itemmgmt_attr_value_country'  => ['name' => 'itemmgmt_attr_value_country',  'type' => 'string', 'internal' => 'country'],
     ];
 
-    /**
-     * Has one relation.
-     *
-     * @var array<string, array{mapper:string, external:string, by?:string, column?:string, conditional?:bool}>
-     * @since 1.0.0
-     */
-    protected static array $ownsOne = [
-        'language' => [
-            'mapper'      => LanguageMapper::class,
-            'external'    => 'itemmgmt_attr_value_lang',
-            'by'          => 'code2',
-            'column'      => 'code2',
-            'conditional' => true,
-        ],
-        'country' => [
-            'mapper'      => CountryMapper::class,
-            'external'    => 'itemmgmt_attr_value_country',
-            'by'          => 'code2',
-            'column'      => 'code2',
-            'conditional' => true,
-        ],
-    ];
-
     /**
      * Primary table.
      *
diff --git a/Models/ItemL11nMapper.php b/Models/ItemL11nMapper.php
index 2e8fa27..0a39ee0 100644
--- a/Models/ItemL11nMapper.php
+++ b/Models/ItemL11nMapper.php
@@ -24,8 +24,6 @@ use phpOMS\Localization\Defaults\LanguageMapper;
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0
- *
- * @todo Do I really want to create a relation to the language mapper? It's not really needed right?
  */
 final class ItemL11nMapper extends DataMapperAbstract
 {
@@ -50,13 +48,6 @@ final class ItemL11nMapper extends DataMapperAbstract
      * @since 1.0.0
      */
     protected static array $ownsOne = [
-        'language' => [
-            'mapper'      => LanguageMapper::class,
-            'external'    => 'itemmgmt_item_l11n_lang',
-            'by'          => 'code2',
-            'column'      => 'code2',
-            'conditional' => true,
-        ],
         'type' => [
             'mapper'   => ItemL11nTypeMapper::class,
             'external' => 'itemmgmt_item_l11n_typeref',
diff --git a/Models/ItemL11nTypeMapper.php b/Models/ItemL11nTypeMapper.php
index 816604f..2142dab 100644
--- a/Models/ItemL11nTypeMapper.php
+++ b/Models/ItemL11nTypeMapper.php
@@ -23,8 +23,6 @@ use phpOMS\DataStorage\Database\DataMapperAbstract;
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0
- *
- * @todo Do I really want to create a relation to the language mapper? It's not really needed right?
  */
 final class ItemL11nTypeMapper extends DataMapperAbstract
 {