diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index f984270..4b3a2a5 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -30,11 +30,6 @@ use phpOMS\Views\View;
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0
- *
- * @todo Orange-Management/Modules#52
- *  Allow user to define start of week
- *  Weeks should be customizable. Some prefer the week to start on Monday, others on Sunday etc.
- *  This is probably a global setting in the backend or user localization!
  */
 final class BackendController extends Controller implements DashboardElementInterface
 {
diff --git a/Controller/Controller.php b/Controller/Controller.php
index d5432c0..83f5efa 100755
--- a/Controller/Controller.php
+++ b/Controller/Controller.php
@@ -15,7 +15,6 @@ declare(strict_types=1);
 namespace Modules\Calendar\Controller;
 
 use phpOMS\Module\ModuleAbstract;
-use phpOMS\Module\WebInterface;
 
 /**
  * Calendar controller class.
diff --git a/Models/CalendarMapper.php b/Models/CalendarMapper.php
index 9b2b746..756daac 100755
--- a/Models/CalendarMapper.php
+++ b/Models/CalendarMapper.php
@@ -9,10 +9,6 @@
  * @license   OMS License 1.0
  * @version   1.0.0
  * @link      https://orange-management.org
- *
- * @todo Orange-Management/Modules#191
- *  When showing a calendar the default behavior should be to only load a fixed amount of months in order to avoid unnecessary overhead.
- *  Maybe only load the current month, the next month and the previous month.
  */
 declare(strict_types=1);
 
diff --git a/Theme/Backend/calendar-dashboard.tpl.php b/Theme/Backend/calendar-dashboard.tpl.php
index 91ae087..0a618a9 100755
--- a/Theme/Backend/calendar-dashboard.tpl.php
+++ b/Theme/Backend/calendar-dashboard.tpl.php
@@ -1,10 +1,5 @@
 <?php declare(strict_types=1);
 
-/**
- * @todo Orange-Management/Modules#69
- *  Create a popup when clicking on an event with full information.
- */
-
 $calendar = $this->getData('calendar');
 ?>
 <div class="row">
diff --git a/Theme/Backend/dashboard-calendar.tpl.php b/Theme/Backend/dashboard-calendar.tpl.php
index 72eb66e..f5b973d 100755
--- a/Theme/Backend/dashboard-calendar.tpl.php
+++ b/Theme/Backend/dashboard-calendar.tpl.php
@@ -12,11 +12,6 @@
  */
 declare(strict_types=1);
 
-/**
- * @todo Orange-Management/Modules#69
- *  Create a popup when clicking on an event with full information.
- */
-
 ?>
 <div id="calendar-dashboard" class="col-xs-12 col-md-6" draggable="true">
     <div class="portlet">