diff --git a/html/js/anc_script.js b/html/js/anc_script.js
index e1b1ce063..ab76c0e24 100644
--- a/html/js/anc_script.js
+++ b/html/js/anc_script.js
@@ -109,11 +109,11 @@ function verify_ca(div)
     return true;
 }
 /*!
- * \brief open a window for searching a CA account, 
+ * \brief open a window for searching a CA account,
  * \param p_dossier dossier id
  * \param p_target ctrl to update
  * \param p_source ctrl containing the pa_id
- * 
+ *
  *
  * \return
  */
@@ -207,7 +207,6 @@ var obj={"oa":
 }
 /**
 * add a row in misc operation for ANC
-*@todo if we add a line, the number of lines become variables
 * the code must be adapted for that
 */
 function anc_add_row(tableid)
diff --git a/html/js/controls.js b/html/js/controls.js
index 7392fb664..613fde4f8 100644
--- a/html/js/controls.js
+++ b/html/js/controls.js
@@ -781,7 +781,7 @@ Ajax.InPlaceCollectionEditor = Class.create(Ajax.InPlaceEditor, {
       onComplete: Prototype.emptyFunction,
       onSuccess: function(transport) {
         var js = transport.responseText.strip();
-        if (!/^\[.*\]$/.test(js)) // TODO: improve sanity check
+        if (!/^\[.*\]$/.test(js)) 
           throw('Server returned an invalid collection representation.');
         this._collection = eval(js);
         this.checkForExternalText();
diff --git a/include/action.common.inc.php b/include/action.common.inc.php
index 73c7195e8..8687701a3 100644
--- a/include/action.common.inc.php
+++ b/include/action.common.inc.php
@@ -284,21 +284,7 @@ function ShowActionList($cn,$p_base)
 
   $see_all=new ICheckBox('see_all');
   $my_action=new ICheckBox('all_action');
-/**
- * @todo
- *   if ( $_REQUEST ['p_action'] != 'suivi_courrier')
- *
-    {
-      $see_all->selected=true;
-      $my_action->selected= true;
-    }
-  else
-    {
-      $see_all->selected=(isset($_REQUEST ['see_all']))?true:false;
-      $my_action->selected= (isset($_REQUEST ['all_action']))?true:false;
-    }
- *
- */
+
   echo _('les actions fermées aussi:').$see_all->input().'<br/>';
 
   echo _('affecté à d\'autre:').$my_action->input().'<br/>';
diff --git a/include/class_acc_tva.php b/include/class_acc_tva.php
index 82c88ec6d..43afbbbab 100644
--- a/include/class_acc_tva.php
+++ b/include/class_acc_tva.php
@@ -28,13 +28,13 @@ require_once('class_database.php');
 
 /*!\brief Acc_Tva is used for to map the table tva_rate
  * parameter are
-- private static $cn;	database connection 
+- private static $cn;	database connection
 - private static $variable=array("id"=>"tva_id",
 		 "label"=>"tva_label",
 		 "rate"=>"tva_rate",
 		 "comment"=>"tva_comment",
 		 "account"=>"tva_poste");
- 
+
 */
 class Acc_Tva
 {
@@ -124,7 +124,7 @@ class Acc_Tva
     }
     /**
      *Load the VAT,
-     *@todo if the label is not found then we get an message error, so the best is probably
+     *@note if the label is not found then we get an message error, so the best is probably
      *to initialize the VAT object with default value
      */
     public function load()
diff --git a/include/contact.inc.php b/include/contact.inc.php
index ae31ecc1f..87059eef6 100644
--- a/include/contact.inc.php
+++ b/include/contact.inc.php
@@ -36,7 +36,6 @@ $sub_action=(isset($_REQUEST['sa']))?$_REQUEST['sa']:"";
 
 // if this page is called from another menu (customer, supplier,...)
 // a button back is added
-// TODO add function for generating url, hidden tags...
 if ( isset ($_REQUEST['url']))
 {
     $retour=HtmlInput::button_anchor('Retour',urldecode($_REQUEST['url']));
diff --git a/include/export_bilan_oth.php b/include/export_bilan_oth.php
index 8e0ec0324..7210bb7f9 100644
--- a/include/export_bilan_oth.php
+++ b/include/export_bilan_oth.php
@@ -34,14 +34,6 @@ $gDossier=dossier::id();
 /* Admin. Dossier */
 $cn=new Database($gDossier);
 
-$User=new User($cn);
-$User->Check();
-
-// TODO a specific level of security for the "bilan" ???
-// Change must be done here
-$User->can_request(IMPBIL);
-
-
 $bilan=new Acc_Bilan($cn);
 $bilan->get_request_get();
 $bilan->load();
diff --git a/include/forecast.inc.php b/include/forecast.inc.php
index 5fc645c0a..fb1c99879 100644
--- a/include/forecast.inc.php
+++ b/include/forecast.inc.php
@@ -33,9 +33,6 @@ $sa = (isset($_REQUEST['sa'])) ? $_REQUEST['sa'] : '';
  *
  *
  * ******************************************************************** */
-/**
- * @todo add security for forecast.inc.php
- */
 if (isset($_GET['del']))
 {
     $forecast = new Forecast($cn, $_GET['f_id']);
diff --git a/include/modele.inc.php b/include/modele.inc.php
index 8ee286fc2..cdef1bad5 100644
--- a/include/modele.inc.php
+++ b/include/modele.inc.php
@@ -22,7 +22,7 @@
 
 /*!\file
  *
- * 
+ *
  * \brief concerne only the template
  *
  */
@@ -120,8 +120,6 @@ if ( isset ($_POST["FMOD_NAME"]) )
 
     $Res=$cn_mod->exec_sql('delete from operation_analytique');
 
-    // TODO
-
     $Res=$cn_mod->exec_sql("truncate table import_tmp");
     //	Reset the closed periode
     $Res=$cn_mod->exec_sql("update parm_periode set p_closed='f'");