diff --git a/src/app/app.component.scss b/src/app/app.component.scss
index 64bcc06e4c894a17b3a9fb92ee59774bebf28c08..38eeabc9524c08bb66465a6620bb7faab9793981 100644
--- a/src/app/app.component.scss
+++ b/src/app/app.component.scss
@@ -1,6 +1,6 @@
 // variables
 
-$navbar_height: 54px; // @TODO not really generic
+$navbar_height: 54px; // not really generic
 
 // rules
 
diff --git a/src/app/components/dialog-edit-param-values/dialog-edit-param-values.component.ts b/src/app/components/dialog-edit-param-values/dialog-edit-param-values.component.ts
index c8f23bbce1b2d30fad4404fe8ed242808c745fa0..b1e6bb84d354f11a15aac47bfbb9ba0180e860af 100644
--- a/src/app/components/dialog-edit-param-values/dialog-edit-param-values.component.ts
+++ b/src/app/components/dialog-edit-param-values/dialog-edit-param-values.component.ts
@@ -277,7 +277,7 @@ export class DialogEditParamValuesComponent implements OnInit {
             if (e.length > 0) {
                 // ensure decimal separator is "." for Number()
                 if (this.decimalSeparator !== ".") {
-                    const re = new RegExp(this.decimalSeparator, "g"); // @TODO remove "g" ?
+                    const re = new RegExp(this.decimalSeparator, "g");
                     e = e.replace(re, ".");
                 }
                 vals.push(Number(e));
@@ -304,7 +304,7 @@ export class DialogEditParamValuesComponent implements OnInit {
                 if (e.length > 0) { // should always be true as separator might be several characters long
                     // ensure decimal separator is "." for Number()
                     if (this.decimalSeparator !== ".") {
-                        const re = new RegExp(this.decimalSeparator, "g"); // @TODO remove "g" ?
+                        const re = new RegExp(this.decimalSeparator, "g");
                         e = e.replace(re, ".");
                     }
                     // 2.1 check it is a valid Number
diff --git a/src/app/components/fieldset-container/fieldset-container.component.ts b/src/app/components/fieldset-container/fieldset-container.component.ts
index 84e9bbdd52c20986db846fbac644daff4be9698c..65bdb84ebfe9ffb7d4d42053cfd5f58e5ca3ab67 100644
--- a/src/app/components/fieldset-container/fieldset-container.component.ts
+++ b/src/app/components/fieldset-container/fieldset-container.component.ts
@@ -82,7 +82,7 @@ export class FieldsetContainerComponent implements DoCheck, AfterViewInit {
             }
             if (clone) {
                 // replace in-place to change properties (overkill)
-                // @TODO why only those two ? loop over all properties in a generic way ?
+                // @WTF why only those two ?
                 newFs.setPropValue("structureType", after.properties.getPropValue("structureType"));
                 newFs.setPropValue("loiDebit", after.properties.getPropValue("loiDebit"));
                 // copy param values
diff --git a/src/app/components/macrorugo-compound-results/macrorugo-compound-results-table.component.ts b/src/app/components/macrorugo-compound-results/macrorugo-compound-results-table.component.ts
index 4d45082aa2128557f0c42c9baad32d0fb1f7d392..abe858dcc5a426d6f7eb832759192c329a16ce3e 100644
--- a/src/app/components/macrorugo-compound-results/macrorugo-compound-results-table.component.ts
+++ b/src/app/components/macrorugo-compound-results/macrorugo-compound-results-table.component.ts
@@ -57,7 +57,7 @@ export class MacrorugoCompoundResultsTableComponent extends ResultsComponentDire
 
             // lines 1 - n-1 (aprons)
             for (let i = 0; i < pr.childrenResults.length; i++) {
-                // @TODO protect loop contents with if(vCalc) ? Will hide erroneous apron results..
+                // protect loop contents with if(vCalc) ? Will hide erroneous apron results..
                 const res = pr.childrenResults[i].resultElements[vi].values;
                 const nub = (pr.childrenResults[i].sourceNub as MacroRugo);
                 // does ZF1 or B vary ?
diff --git a/src/app/components/modules-diagram/modules-diagram.component.ts b/src/app/components/modules-diagram/modules-diagram.component.ts
index 6ae5a2a8f7d8d5be5ce9a6837f4170d1be1d421b..7d0fcf91d0d37e394ae5296aea5ff24f0a338b0f 100644
--- a/src/app/components/modules-diagram/modules-diagram.component.ts
+++ b/src/app/components/modules-diagram/modules-diagram.component.ts
@@ -116,7 +116,7 @@ export class ModulesDiagramComponent implements AfterContentInit, AfterViewCheck
     public ngAfterContentInit(): void {
         this.error = false;
         mermaid.initialize({
-            // theme: "forest", // @TODO thème Irstea !
+            // theme: "forest"
             flowchart: {
                 curve: "basis"
             }
diff --git a/src/app/components/pab-table/pab-table.component.ts b/src/app/components/pab-table/pab-table.component.ts
index e494a654847d6ca5695522802f030f5d70cfb48c..a73cac1dd232653f79e953b51306026c5f001fc7 100644
--- a/src/app/components/pab-table/pab-table.component.ts
+++ b/src/app/components/pab-table/pab-table.component.ts
@@ -102,7 +102,7 @@ export class PabTableComponent implements AfterViewInit, OnInit {
         return this.hasModel(cell) && ! this.isSelect(cell);
     }
 
-    /** returns true if the cell is a select box @TODO rename */
+    /** returns true if the cell is a select box */
     public isSelect(cell: any): boolean {
         return this.hasModel(cell) && (cell.options !== undefined);
     }
diff --git a/src/app/services/internationalisation.service.ts b/src/app/services/internationalisation.service.ts
index 9137b0e2b188e9601cd85d342d3322ee8f1400cd..09d77fc4e6ef9e1820beb2b5da54e76ae3606d25 100644
--- a/src/app/services/internationalisation.service.ts
+++ b/src/app/services/internationalisation.service.ts
@@ -66,7 +66,6 @@ export class I18nService extends Observable implements Observer {
         // did language change ?
         if (this._currentLanguage !== code) {
             this._currentLanguage = code;
-            // @TODO keep old messages for backup-language mechanisms ?
             this._Messages = undefined;
             // reload all messages
             const that = this;