diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index b08d93e..77d70e9 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -43,31 +43,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#50
- *  Allow collection modification
- *  Allow to change (add/remove) collection components.
- *
- * @todo Orange-Management/Modules#59
- *  Implement resumable uploads
- *  This is especially useful if someone wants to upload when he/she has wifi access
- *
- * @todo Orange-Management/Modules#150
- *  Allow to create new files (not only upload)
- *  In many cases it would be nice to create a new file manually with the module (e.g. create a new .txt or .sqlite file) which then can get edited directly in the media module.
- *
- * @todo Orange-Management/Modules#160
- *  Fix media upload
- *
- * @todo Orange-Management/oms-Media#3
- *  [MultiUpload] Allow to create a collection when uploading multiple files
- *
- * @todo Orange-Management/oms-Media#14
- *  [Download] Allow to download files
- *
- * @todo Orange-Management/oms-Media#15
- *  [Download] Allow to download collections
- *  Downloading a collection should return a zip or tar.gz
  */
 final class ApiController extends Controller
 {
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index b0c735e..f4eaa4a 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -33,10 +33,6 @@ use phpOMS\Views\View;
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0
- *
- * @todo Orange-Management/Modules#150
- *  Allow to create new files (not only upload)
- *  In many cases it would be nice to create a new file manually with the module (e.g. create a new .txt or .sqlite file) which then can get edited directly in the media module.
  */
 final class BackendController extends Controller
 {
diff --git a/Controller/Controller.php b/Controller/Controller.php
index e404f3f..0900ca6 100755
--- a/Controller/Controller.php
+++ b/Controller/Controller.php
@@ -15,7 +15,6 @@ declare(strict_types=1);
 namespace Modules\Media\Controller;
 
 use phpOMS\Module\ModuleAbstract;
-use phpOMS\Module\WebInterface;
 
 /**
  * Media class.
diff --git a/Models/Media.php b/Models/Media.php
index b20afbd..4724bf7 100755
--- a/Models/Media.php
+++ b/Models/Media.php
@@ -196,13 +196,6 @@ class Media implements \JsonSerializable
      */
     public function encrypt(string $password, string $outputPath = null) : string
     {
-        /**
-         * @todo Orange-Management/Modules#185
-         *  Sometimes it's important to protect sensitive information. Therefore an encryption for media files becomes necessary.
-         *  The media module should allow to define a password (not encrypted on the hard drive)
-         *  and an encryption checkbox which forces a password AND encrypts the file on the harddrive.
-         */
-
         return '';
     }
 
@@ -218,13 +211,6 @@ class Media implements \JsonSerializable
      */
     public function decrypt(string $password, string $outputPath = null) : string
     {
-        /**
-         * @todo Orange-Management/Modules#185
-         *  Sometimes it's important to protect sensitive information. Therefore an encryption for media files becomes necessary.
-         *  The media module should allow to define a password (not encrypted on the hard drive)
-         *  and an encryption checkbox which forces a password AND encrypts the file on the harddrive.
-         */
-
         return '';
     }
 
diff --git a/Models/UploadFile.php b/Models/UploadFile.php
index d98b6fb..51ec19a 100755
--- a/Models/UploadFile.php
+++ b/Models/UploadFile.php
@@ -210,26 +210,12 @@ class UploadFile
                 $result[$key]['nonce'] = $nonce;
             }
 
-            /**
-             * @todo Orange-Management/Modules#203
-             *  Automatically enable image interlacing
-             *  Interlacing png images currently messes up the images.
-             */
             /*
             if ($this->isInterlaced && \in_array($extension, FileUtils::IMAGE_EXTENSION)) {
                 //$this->interlace($extension, $dest);
             }
             */
 
-            /**
-             * @todo Orange-Management/Modules#204
-             *  Automatically change the file encoding of text files
-             *  Basic text files should be converted to utf-8. E.g.
-             *  * csv
-             *  * log
-             *  * txt
-             *  * ...
-             */
             /*
             if ($encoding !== '') {
                 // changing encoding bugs out image files
diff --git a/Theme/Backend/Components/Upload/upload.tpl.php b/Theme/Backend/Components/Upload/upload.tpl.php
index de1e0fd..5138c3e 100755
--- a/Theme/Backend/Components/Upload/upload.tpl.php
+++ b/Theme/Backend/Components/Upload/upload.tpl.php
@@ -1,7 +1,3 @@
-<!--
-@todo Orange-Management/Modules#58
-    Implement drag/drop upload
--->
 <div class="portlet">
     <div class="portlet-head"><?= $this->getHtml('Media'); ?></div>
     <form id="<?= $this->form; ?>-upload">
diff --git a/Theme/Backend/media-collection-create.tpl.php b/Theme/Backend/media-collection-create.tpl.php
index 978a39c..4803258 100755
--- a/Theme/Backend/media-collection-create.tpl.php
+++ b/Theme/Backend/media-collection-create.tpl.php
@@ -14,11 +14,6 @@ declare(strict_types=1);
 
 use phpOMS\Uri\UriFactory;
 
-/**
- * @todo Orange-Management/Modules#58
- *  Implement drag/drop upload
- */
-
 /**
  * @var \phpOMS\Views\View $this
  */
diff --git a/Theme/Backend/media-upload.tpl.php b/Theme/Backend/media-upload.tpl.php
index 355e258..c420ec8 100755
--- a/Theme/Backend/media-upload.tpl.php
+++ b/Theme/Backend/media-upload.tpl.php
@@ -14,11 +14,6 @@ declare(strict_types=1);
 
 use phpOMS\Uri\UriFactory;
 
-/**
- * @todo Orange-Management/Modules#58
- *  Implement drag/drop upload
- */
-
 /**
  * @var \phpOMS\Views\View $this
  */