diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 01311df..d5c0aa2 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -37,23 +37,6 @@ use phpOMS\Utils\Parser\Markdown\Markdown;
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0
- *
- * @todo Orange-Management/oms-Tasks#9
- *  Create task/calendar reference
- *  Show tasks in calendars not just in user calendars but also in event calendars and project calendars?!
- *
- * @todo Orange-Management/Modules#33
- *  Repeating tasks should be implemented.
- *  At the same time this means a fix to the due date needs to be implemented.
- *  Maybe simple calculate the time difference between first start and first due?
- *
- * @todo Orange-Management/oms-Tasks#6
- *  Add tags
- *  The user should be able to add a tag to a task and also decide on the color of the tag.
- *  User means the creator of the task.
- *  If task elements should have their own tags of if other users should be able to modify tags should be ignored for now.
- *  Maybe instead of creating a tasks specific tag system a global tag system could be used? Maybe this was already created as an issue.
- *  Tags should be globally and users should be able to define tags separately for their own organization purposes.
  */
 final class ApiController extends Controller
 {
@@ -266,11 +249,6 @@ final class ApiController extends Controller
             return;
         }
 
-        /**
-         * @todo Orange-Management/oms-Tasks#3
-         *  Validate that the user is allowed to create a task element for a specific task
-         */
-
         $task    = TaskMapper::get((int) ($request->getData('task')));
         $element = $this->createTaskElementFromRequest($request, $task);
         $task->setStatus($element->getStatus());
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 2673265..16c1fe1 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -36,11 +36,6 @@ use phpOMS\Views\View;
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0
- *
- * @todo Orange-Management/oms-Tasks#5
- *  Add a calender like task view
- *  If you define tasks far into the future it can become very difficult to read and organize them.
- *  For this purpose there should be a calendar view for them.
  */
 final class BackendController extends Controller implements DashboardElementInterface
 {
@@ -53,11 +48,6 @@ final class BackendController extends Controller implements DashboardElementInte
      *
      * @return RenderableInterface Returns a renderable object
      *
-     * @todo Orange-Management/oms-Tasks#6
-     *  Implement dashboard statistics
-     *  Currently on the dashboard there is only a placeholder for some stats.
-     *  These stats need to be implemented.
-     *
      * @since 1.0.0
      * @codeCoverageIgnore
      */
@@ -226,10 +216,6 @@ final class BackendController extends Controller implements DashboardElementInte
      *
      * @return int Returns the amount of unread tasks
      *
-     * @todo Orange-Management/oms-Tasks#1
-     *  Implement has seen feature
-     *  In order to allow a "user has seen task x" feature every task should have a user/account status for the different users (creator, cc, receiver).
-     *
      * @since 1.0.0
      */
     public function openNav(int $account) : int
diff --git a/Controller/Controller.php b/Controller/Controller.php
index 3c4db96..bf1ff0c 100755
--- a/Controller/Controller.php
+++ b/Controller/Controller.php
@@ -15,7 +15,6 @@ declare(strict_types=1);
 namespace Modules\Tasks\Controller;
 
 use phpOMS\Module\ModuleAbstract;
-use phpOMS\Module\WebInterface;
 
 /**
  * Task class.
diff --git a/tests/BackendControllerTest.php b/tests/BackendControllerTest.php
index 5fe4009..4b6b98c 100755
--- a/tests/BackendControllerTest.php
+++ b/tests/BackendControllerTest.php
@@ -83,11 +83,6 @@ class BackendControllerTest extends \PHPUnit\Framework\TestCase
     {
         self::assertEquals(0, $this->module->openNav(999));
 
-        /**
-         * @todo Orange-Management/oms-Tasks#1
-         *  Implement has seen feature
-         *  In order to allow a "user has seen task x" feature every task should have a user/account status for the different users (creator, cc, receiver).
-         */
         // self::assertGreaterThan(0, $this->module->openNav(1));
     }
 }