diff --git a/app/controllers/wot.js b/app/controllers/wot.js
index 6a7d653cd0f5e43832175c0eccdfbbd28f7064b7..f60b97df4e81b82880c173edfd7df65252c8e782 100644
--- a/app/controllers/wot.js
+++ b/app/controllers/wot.js
@@ -104,7 +104,6 @@ function WOTBinding (server) {
         cert.sigDate = certifier.buid;
         cert.wasMember = true; // As we checked if(certified)
         if (!cert.cert_time) {
-          // TODO: would be more efficient to save medianTime on certification reception
           let certBlock = yield server.dal.getBlock(cert.block_number);
           cert.cert_time = {
             block: certBlock.number,
@@ -164,7 +163,6 @@ function WOTBinding (server) {
         cert.sigDate = certified.buid;
         cert.wasMember = true; // As we checked if(certified)
         if (!cert.cert_time) {
-          // TODO: would be more efficient to save medianTime on certification reception (note: now partially done with INDEX)
           let certBlock = yield server.dal.getBlock(cert.block_number);
           cert.cert_time = {
             block: certBlock.number,
diff --git a/app/lib/cfs.js b/app/lib/cfs.js
index e1821e79fca96849e45bf1f91e37e74d3312c1d3..4d8a55804e809c4277d8a54938d9c16f0b74da31 100644
--- a/app/lib/cfs.js
+++ b/app/lib/cfs.js
@@ -196,7 +196,7 @@ function CFSCore(rootPath, qfs, parent) {
       return JSON.parse(data);
     } catch(err) {
       if (data && err.message.match(/^Unexpected token {/)) {
-        // TODO: this is a bug thrown during Unit Tests with MEMORY_MODE true...
+        // This is a bug thrown during Unit Tests with MEMORY_MODE true...
         return JSON.parse(data.match(/^(.*)}{.*/)[1] + '}');
       } else if (err.message.match(/^Unexpected end of input/)) {
         // Could not read, return empty object
diff --git a/app/lib/computation/blockGenerator.js b/app/lib/computation/blockGenerator.js
index 7922bd59f39d4d9830e05f19d7a0e902fdf77b6f..fb71891570a5591f0c0f0634fb3778c8674e50c7 100644
--- a/app/lib/computation/blockGenerator.js
+++ b/app/lib/computation/blockGenerator.js
@@ -348,7 +348,6 @@ function BlockGenerator(mainContext, prover) {
     if (!isIdentityLeaving) {
       if (!current) {
         // Look for certifications from initial joiners
-        // TODO: check if this is still working
         const certs = yield dal.certsNotLinkedToTarget(idHash);
         foundCerts = _.filter(certs, function(cert){
           // Add 'joiners && ': special case when block#0 not written ANd not joiner yet (avoid undefined error)
diff --git a/app/lib/crypto/keyring.js b/app/lib/crypto/keyring.js
index 19aa34157a147f27103b24b4de1ace907e86f4f1..070af5cb5fadd83a58a2b4c8a9c0a301e2642a86 100644
--- a/app/lib/crypto/keyring.js
+++ b/app/lib/crypto/keyring.js
@@ -46,7 +46,7 @@ function Key(pub, sec) {
 
   this.signSync = (msg) => {
     const m = nacl.util.decodeUTF8(msg);
-    const signedMsg = naclBinding.sign(m, rawSec()); // TODO: super weird
+    const signedMsg = naclBinding.sign(m, rawSec());
     const sig = new Uint8Array(crypto_sign_BYTES);
     for (let i = 0; i < sig.length; i++) {
       sig[i] = signedMsg[i];
diff --git a/app/lib/dal/fileDAL.js b/app/lib/dal/fileDAL.js
index 186d15e6197a9ee6968e0027c643a096f4d972da..be5d314ba8e579482b203907c85e8c14a2ebc81f 100644
--- a/app/lib/dal/fileDAL.js
+++ b/app/lib/dal/fileDAL.js
@@ -67,7 +67,6 @@ function FileDAL(params) {
     }
     logger.debug("Upgrade database...");
     yield that.metaDAL.upgradeDatabase();
-    // TODO: remove as of v1.0
     const latestMember = yield that.iindexDAL.getLatestMember();
     if (latestMember && that.wotb.getWoTSize() > latestMember.wotb_id + 1) {
       logger.warn('Maintenance: cleaning wotb...');
diff --git a/app/lib/dup/indexer.js b/app/lib/dup/indexer.js
index 2e02354893fdd3305856b457df608aa071ddd99a..da579a8a7961e690bb1c725caa55461da616740f 100644
--- a/app/lib/dup/indexer.js
+++ b/app/lib/dup/indexer.js
@@ -1484,7 +1484,7 @@ function median(values) {
     // Even number: the median is the average between the 2 central values, ceil rounded.
     const firstValue = values[nbValues / 2];
     const secondValue = values[nbValues / 2 - 1];
-    med = ((firstValue + secondValue) / 2); // TODO v1.0 median ceil rounded
+    med = ((firstValue + secondValue) / 2);
   } else {
     med = values[(nbValues + 1) / 2 - 1];
   }