diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 4ad2b27..e9c45c4 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -34,14 +34,6 @@ use phpOMS\Model\Message\FormValidation;
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0
- *
- * @todo Orange-Management/Modules#12
- *  Dynamic providing should be handled in the DB
- *  Providing for the dashboard is dynamic and can be customized by the user himself.
- *  Hence the loading of the plugins should be handled in the module manager and database.
- *  Module specific providing could remain the same? Maybe even create a dashboard table just for this like the navigation module.
- *  This way modules can tell the dashboard that there is a plugin it can use.
- *  In this table it also should be possible to specify additional information.
  */
 final class ApiController extends Controller
 {
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index cfbfb76..4eaf193 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -29,14 +29,6 @@ use phpOMS\Views\View;
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0
- *
- * @todo Orange-Management/oms-Dashboard#3
- *  Default dashboard styles
- *  Allow default dashboard templates which users can select
- *
- * @todo Orange-Management/oms-Dashboard#4
- *  [Bug] Drag&Drop element sometimes disappear on drop
- *  When you move the drag and drop elements sometimes (maybe 5%) of the time they disappear on drop. It seems like they cannot be inserted in the DOM and are gone.
  */
 final class BackendController extends Controller
 {
@@ -49,10 +41,6 @@ final class BackendController extends Controller
      *
      * @return RenderableInterface
      *
-     * @todo Orange-Management/Modules#57
-     *  Users should be able to customize their dashboard.
-     *  This includes drag and drop and module selection.
-     *
      * @since 1.0.0
      * @codeCoverageIgnore
      */
diff --git a/Controller/Controller.php b/Controller/Controller.php
index 1ab81cf..5218e7d 100755
--- a/Controller/Controller.php
+++ b/Controller/Controller.php
@@ -15,7 +15,6 @@ declare(strict_types=1);
 namespace Modules\Dashboard\Controller;
 
 use phpOMS\Module\ModuleAbstract;
-use phpOMS\Module\WebInterface;
 
 /**
  * Dashboard class.