diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 16fd0ca..33371bc 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -36,12 +36,6 @@ use phpOMS\Model\Message\FormValidation;
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0
- *
- * @todo Orange-Management/Modules#138
- *  Allow Admin to login as user
- *  Admins should be allowed to log in as users.
- *  This doesn't mean that the admins can create content in the name of a user but they get to see all the things this user can see.
- *  They basically log in with the same permissions.
  */
 final class ApiController extends Controller
 {
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index a99173b..ff8e446 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -61,12 +61,6 @@ final class BackendController extends Controller
      *
      * @return RenderableInterface
      *
-     * @todo Orange-Management/Modules#104
-     *  Define account types to show
-     *  Currently all accounts are shown in the profile module.
-     *  The profile module should have an option to define which accounts to show (e.g. only employee models, partners etc.).
-     *  To do this the profile module either needs to request them from the modules or the modules have to provide these accounts.
-     *
      * @since 1.0.0
      */
     public function viewProfileList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
@@ -95,10 +89,6 @@ final class BackendController extends Controller
      *
      * @return RenderableInterface
      *
-     * @todo Orange-Management/Modules#53
-     *  Implement basic profile view
-     *  The profile view currently only contains fixed values this needs to change.
-     *
      * @since 1.0.0
      */
     public function viewProfileSingle(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
diff --git a/Controller/Controller.php b/Controller/Controller.php
index d5d84df..0ac2041 100755
--- a/Controller/Controller.php
+++ b/Controller/Controller.php
@@ -15,7 +15,6 @@ declare(strict_types=1);
 namespace Modules\Profile\Controller;
 
 use phpOMS\Module\ModuleAbstract;
-use phpOMS\Module\WebInterface;
 
 /**
  * Profile class.