diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b9dc7a5..cab9f5e 100755
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -12,14 +12,7 @@ If you have a good idea for improvement feel free to create a new issue with all
 
 ### Issues
 
-Feel free to grab any open issue implement it and create a new pull request. Most issues can be found in the code and have the following structure:
-
-```php
-/**
- * @todo Orange-Management/Orange-Management#ISSUE_NUMBER [d:difficulty]
- *  Description for the issue
- */
-```
+Feel free to grab any open issue implement it and create a new pull request. Most issues can be found in the `Project.md` file in the `Docs` repository.
 
 The issue information can be used to provide additional information such as priority, difficulty and type. For your first issue try to find a issue marked `[d:first]` or `[d:beginner]`.
 
diff --git a/Models/Editor.js b/Models/Editor.js
index df69e09..2f3952a 100755
--- a/Models/Editor.js
+++ b/Models/Editor.js
@@ -7,10 +7,6 @@ import { Markdown } from '../../../jsOMS/Utils/Parser/Markdown.js';
  * @license   OMS License 1.0
  * @version   1.0.0
  * @since     1.0.0
- *
- * @todo Orange-Management/Modules#45
- *  Implement tools
- *  The tools should be able to insert the markdown text into a textarea.
  */
 export class Editor {
     constructor (id)
diff --git a/Theme/Backend/Components/Editor/inline-editor-tools.tpl.php b/Theme/Backend/Components/Editor/inline-editor-tools.tpl.php
index b8aa07b..9aa3a3d 100755
--- a/Theme/Backend/Components/Editor/inline-editor-tools.tpl.php
+++ b/Theme/Backend/Components/Editor/inline-editor-tools.tpl.php
@@ -1,7 +1,3 @@
-<!--
-@todo Orange-Management/cssOMS#16
-    The horizontal scroll/slider causes the flexbox (nav) to break
--->
 <div id="<?= $this->renderId(); ?>" class="slider click">
     <ul class="h-list">
         <li><i data-editor-button="a" class="btn editor-button fa fa-lg fa-undo"></i>