diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 673b5d8..e5260bf 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -44,13 +44,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#70
- *  There is no voting implemented right now, this needs to be added (visually and model/database)
- *
- * @todo Orange-Management/Modules#78
- *  Edit functionality
- *  Currently nothing can be edited (change)
  */
 final class ApiController extends Controller
 {
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 3a3c3c1..bc6197d 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -28,10 +28,6 @@ use phpOMS\Views\View;
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0
- *
- * @todo Orange-Management/Modules#78
- *  Edit functionality
- *  Currently nothing can be edited (change)
  */
 final class BackendController extends Controller
 {
diff --git a/Controller/Controller.php b/Controller/Controller.php
index b52f8f1..ef947ce 100755
--- a/Controller/Controller.php
+++ b/Controller/Controller.php
@@ -15,7 +15,6 @@ declare(strict_types=1);
 namespace Modules\QA\Controller;
 
 use phpOMS\Module\ModuleAbstract;
-use phpOMS\Module\WebInterface;
 
 /**
  * Task class.
diff --git a/Models/QACategoryL11nMapper.php b/Models/QACategoryL11nMapper.php
index 808070b..9d7c47c 100644
--- a/Models/QACategoryL11nMapper.php
+++ b/Models/QACategoryL11nMapper.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 QACategoryL11nMapper extends DataMapperAbstract
 {
@@ -42,22 +40,6 @@ final class QACategoryL11nMapper extends DataMapperAbstract
         'qa_category_l11n_language'      => ['name' => 'qa_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'          => 'qa_category_l11n_language',
-            'by'                => 'code2',
-            'column'            => 'code2',
-            'conditional'       => true,
-        ],
-    ];
-
     /**
      * Primary table.
      *
diff --git a/Theme/Backend/qa-question.tpl.php b/Theme/Backend/qa-question.tpl.php
index 9ad1e13..b2e4402 100755
--- a/Theme/Backend/qa-question.tpl.php
+++ b/Theme/Backend/qa-question.tpl.php
@@ -14,12 +14,6 @@ declare(strict_types=1);
 
 use phpOMS\Uri\UriFactory;
 
-/**
- * @todo Orange-Management/Modules#73
- *  Profile pics
- *  There are no profile pics in questions and answers. Implement!
- */
-
 $question = $this->getData('question');
 $answers  = $question->getAnswers();
 
diff --git a/Theme/Backend/qa-tag-list.tpl.php b/Theme/Backend/qa-tag-list.tpl.php
index 77b04eb..d661a36 100755
--- a/Theme/Backend/qa-tag-list.tpl.php
+++ b/Theme/Backend/qa-tag-list.tpl.php
@@ -12,12 +12,6 @@
  */
 declare(strict_types=1);
 
-/**
- * @todo Orange-Management/Modules#73
- *  Profile pics
- *  There are no profile pics in questions and answers. Implement!
- */
-
 $tags = $this->getData('tags');
 
 /** @var \phpOMS\Views\View $this */