diff --git a/Controllers/RecipeController.php b/Controllers/RecipeController.php
index ca88f03..48ba988 100644
--- a/Controllers/RecipeController.php
+++ b/Controllers/RecipeController.php
@@ -9,7 +9,6 @@ final class RecipeController
             throw new HTTPSpecialCaseException(404);
         }
 
-        //TODO MAKE THE VIEW USE THE NEW DATA FORMAT
         $O_recipe = RecipeModel::getByID($A_urlParams[0]);
         if ($O_recipe === null) {
             throw new HTTPSpecialCaseException(404);
@@ -209,7 +208,6 @@ final class RecipeController
     private function searchQueryView(Array $A_urlParams = null, Array $A_postParams = null, Array $A_getParams = null)
     {
 
-        //TODO change this when the function will return object array
         $A_results = RecipeModel::searchRecipesByName($A_getParams["query"]);
         
         View::show("recipe/search", array(
diff --git a/Controllers/UserController.php b/Controllers/UserController.php
index 57947b1..ec1126e 100644
--- a/Controllers/UserController.php
+++ b/Controllers/UserController.php
@@ -103,8 +103,6 @@ final class UserController
         header("Location: /");
     }
 
-    // Kept for compatibility purposes
-    // TODO do a redirect route once implemented
     public function viewAction(Array $A_urlParams = null, Array $A_postParams = null)
     {
         return self::defaultAction($A_urlParams, $A_postParams);
@@ -120,7 +118,6 @@ final class UserController
 
         $O_user = UserModel::getByID($_SESSION["ID"]);
         
-        //TODO Convert User into array
         return View::show("user/edit", array("USER" => $O_user));
     }
 
diff --git a/Models/RecipeModel.php b/Models/RecipeModel.php
index 874a1ed..c3ed11a 100644
--- a/Models/RecipeModel.php
+++ b/Models/RecipeModel.php
@@ -170,7 +170,6 @@ final class RecipeModel
         return explode("\n\n", str_replace("\r", "", $this->S_INSTRUCTIONS));
     }
 
-    //TODO: return array object
     public static function searchRecipesByName($S_query)
     {