diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index a5d7eb0..d315a35 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -42,10 +42,6 @@ use phpOMS\Utils\Parser\Markdown\Markdown;
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0
- *
- * @todo Orange-Management/Modules#79
- *  Add category management
- *  Categories cannot get managed right (created and edited). Categories need to have a language component.
  */
 final class ApiController extends Controller
 {
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 8436ed8..0f689e3 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -36,10 +36,6 @@ use phpOMS\Views\View;
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0
- *
- * @todo Orange-Management/Modules#79
- *  Add category management
- *  Categories cannot get managed right (created and edited). Categories need to have a language component.
  */
 final class BackendController extends Controller
 {
diff --git a/Controller/Controller.php b/Controller/Controller.php
index b8151ef..373a2aa 100755
--- a/Controller/Controller.php
+++ b/Controller/Controller.php
@@ -15,7 +15,6 @@ declare(strict_types=1);
 namespace Modules\Knowledgebase\Controller;
 
 use phpOMS\Module\ModuleAbstract;
-use phpOMS\Module\WebInterface;
 
 /**
  * Task class.
diff --git a/Models/WikiCategoryL11nMapper.php b/Models/WikiCategoryL11nMapper.php
index 01e9c5e..ce33ae7 100644
--- a/Models/WikiCategoryL11nMapper.php
+++ b/Models/WikiCategoryL11nMapper.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 WikiCategoryL11nMapper extends DataMapperAbstract
 {
@@ -42,22 +40,6 @@ final class WikiCategoryL11nMapper extends DataMapperAbstract
         'wiki_category_l11n_language'      => ['name' => 'wiki_category_l11n_language', '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'          => 'wiki_category_l11n_language',
-            'by'                => 'code2',
-            'column'            => 'code2',
-            'conditional'       => true,
-        ],
-    ];
-
     /**
      * Primary table.
      *