diff --git a/AMOEBAonAMAK/src/agents/AmoebaAgent.java b/AMOEBAonAMAK/src/agents/AmoebaAgent.java
index 132cad38b43c0dc8ed11a6530e6ef2106ac9ef3d..45a2c6c1ba8e1985d2d4a11c0c2075cfeff62fb5 100644
--- a/AMOEBAonAMAK/src/agents/AmoebaAgent.java
+++ b/AMOEBAonAMAK/src/agents/AmoebaAgent.java
@@ -28,7 +28,6 @@ public abstract class AmoebaAgent extends Agent<AMOEBA, World> implements Loggab
 	
 	@Override
 	protected void onReady() {
-		// TODO Auto-generated method stub
 		super.onReady();
 		logger().debug("CYCLE "+getAmas().getCycle(), "Agent %s ready.", toString());
 	}
diff --git a/AMOEBAonAMAK/src/agents/context/Context.java b/AMOEBAonAMAK/src/agents/context/Context.java
index 8affca322453fbc10edd188d9b518a18b47a463f..66e86ac3836260b524b912ec2e61fb6c4c60e658 100644
--- a/AMOEBAonAMAK/src/agents/context/Context.java
+++ b/AMOEBAonAMAK/src/agents/context/Context.java
@@ -82,10 +82,6 @@ public class Context extends AmoebaAgent {
 		
 		regressionPerformance = new DynamicPerformance(successesBeforeDiminution, errorsBeforeAugmentation, getAmas().getHeadAgent().getAverageRegressionPerformanceIndicator(), augmentationFactorError, diminutionFactorError, minError);
 		getAmas().addSpatiallyAlteredContextForUnityUI(this);
-		
-		//TODO in amak, cannot kill a agent before its 1st cycle
-		//NCSDetection_Uselessness();
-
 	}
 
 	public Context(AMOEBA amoeba, Context fatherContext, HashMap<Percept, Pair<Double, Double>> contextDimensions) {
@@ -120,8 +116,7 @@ public class Context extends AmoebaAgent {
 			// true, v, world);
 			ranges.put(p, r);
 			ranges.get(p).setValue(p.getValue());
-			// TODO
-			// sendExpressMessage(null, MessageType.REGISTER, p);
+
 			firstPoint.addDimension(p, p.getValue());
 
 			p.addContextProjection(this);
@@ -154,8 +149,6 @@ public class Context extends AmoebaAgent {
 
 			ranges.put(pct, r);
 			ranges.get(pct).setValue(center);
-			// TODO
-			// sendExpressMessage(null, MessageType.REGISTER, pct);
 
 			pct.addContextProjection(this);
 		}
@@ -194,8 +187,7 @@ public class Context extends AmoebaAgent {
 
 			ranges.put(v, r);
 			ranges.get(v).setValue(v.getValue());
-			// TODO
-			// sendExpressMessage(null, MessageType.REGISTER, v);
+
 			firstPoint.addDimension(v, v.getValue());
 
 			v.addContextProjection(this);;
diff --git a/AMOEBAonAMAK/src/agents/context/Experiment.java b/AMOEBAonAMAK/src/agents/context/Experiment.java
index 631300c0fdc24281d54b0854493524a63ad1f935..3dcd44062b082e8f361f07c992f74fdea38407ca 100644
--- a/AMOEBAonAMAK/src/agents/context/Experiment.java
+++ b/AMOEBAonAMAK/src/agents/context/Experiment.java
@@ -7,7 +7,6 @@ import java.util.LinkedHashMap;
 import agents.context.Context;
 import agents.percept.Percept;
 
-// TODO: Auto-generated Javadoc
 /**
  * The Class Experiment.
  */
diff --git a/AMOEBAonAMAK/src/agents/context/Range.java b/AMOEBAonAMAK/src/agents/context/Range.java
index e61452d26366bb13409ddba9adb9630a4453e640..5529a9ac87ad02a18553d7e6df475900d45f6517 100644
--- a/AMOEBAonAMAK/src/agents/context/Range.java
+++ b/AMOEBAonAMAK/src/agents/context/Range.java
@@ -11,7 +11,6 @@ import ncs.NCS;
 import utils.Pair;
 import utils.TRACE_LEVEL;
 
-// TODO: Auto-generated Javadoc
 /**
  * The Class Range.
  */
diff --git a/AMOEBAonAMAK/src/agents/context/localModel/LocalModelMillerRegression.java b/AMOEBAonAMAK/src/agents/context/localModel/LocalModelMillerRegression.java
index 1a9bcee4aa2ff7bff3472e4d74067a55d44af682..09e8863819aa2a36fcb0d8d9d4896a2bc36979e3 100644
--- a/AMOEBAonAMAK/src/agents/context/localModel/LocalModelMillerRegression.java
+++ b/AMOEBAonAMAK/src/agents/context/localModel/LocalModelMillerRegression.java
@@ -11,7 +11,6 @@ import agents.percept.Percept;
 import utils.Pair;
 import utils.TRACE_LEVEL;
 
-// TODO: Auto-generated Javadoc
 /**
  * The Class LocalModelMillerRegression.
  */
diff --git a/AMOEBAonAMAK/src/agents/head/Head.java b/AMOEBAonAMAK/src/agents/head/Head.java
index e0713dc3ca984abc162d7d3d0b3df1b5f0890669..d07ae056426db010088f33f0bf74e9bb331f4b79 100644
--- a/AMOEBAonAMAK/src/agents/head/Head.java
+++ b/AMOEBAonAMAK/src/agents/head/Head.java
@@ -282,9 +282,9 @@ public class Head extends AmoebaAgent {
 				getAmas().data.prediction = nearestContext.getActionProposal();
 				bestContext = nearestContext;
 			} else {
-				//TODO THIS IS VERY INEFICIENT ! amoeba should not look globally, but right now there's no other strategy
-				// to limit performance impact, we limit our search on a random sample.
-				// a better way would be to increase neighborhood.
+				//TODO THIS IS VERY INEFICIENT ! amoeba should not look globally, but right now there's no other strategy.
+				// To limit performance impact, we limit our search on a random sample.
+				// A better way would be to increase neighborhood.
 				PrintOnce.print("Play without oracle : no nearest context in neighbors, searching in a random sample. (only shown once)");
 				List<Context> searchList = RandomUtils.pickNRandomElements(getAmas().getContexts(), 100);
 				nearestContext = this.getNearestContext(searchList);
diff --git a/AMOEBAonAMAK/src/experiments/F_XY_System.java b/AMOEBAonAMAK/src/experiments/F_XY_System.java
index 30f3fdfdf8fa9706fea2abee71c0a9307b06fc2d..8aba6d446a4bb86d6aea058b234028ff40b8adac 100644
--- a/AMOEBAonAMAK/src/experiments/F_XY_System.java
+++ b/AMOEBAonAMAK/src/experiments/F_XY_System.java
@@ -59,32 +59,25 @@ public class F_XY_System implements StudiedSystem {
 
 	@Override
 	public HashMap<String, Double> getOutputWithNoise(double noiseRange) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
 	public HashMap<String, Double> getOutputWithAmoebaRequest(HashMap<String, Double> amoebaRequest,
 			double noiseRange) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
 	public void setActiveLearning(boolean value) {
-		// TODO Auto-generated method stub
-		
 	}
 
 	@Override
 	public void setSelfRequest(HashMap<Percept, Double> request) {
-		// TODO Auto-generated method stub
-		
 	}
 
 	@Override
 	public HashMap<String, Double> getIntput() {
-		// TODO Auto-generated method stub
 		return null;
 	}
 }
\ No newline at end of file
diff --git a/AMOEBAonAMAK/src/experiments/Main.java b/AMOEBAonAMAK/src/experiments/Main.java
index 73ac6686b44a720240b2c3f161457bce23256bb1..4cd5643ea4f16c72567fe716d54b72cd9223787b 100644
--- a/AMOEBAonAMAK/src/experiments/Main.java
+++ b/AMOEBAonAMAK/src/experiments/Main.java
@@ -45,7 +45,6 @@ public class Main {
 			try {
 				Thread.currentThread().wait();
 			} catch (InterruptedException e) {
-				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
 		}
diff --git a/AMOEBAonAMAK/src/experiments/NDimCube.java b/AMOEBAonAMAK/src/experiments/NDimCube.java
index 8e48b4266d9d9b3c296bd37501d10b6471b7793b..fcb7ceb617403a236849ff2f00d7b0b545c27ac3 100644
--- a/AMOEBAonAMAK/src/experiments/NDimCube.java
+++ b/AMOEBAonAMAK/src/experiments/NDimCube.java
@@ -106,32 +106,25 @@ public class NDimCube implements StudiedSystem{
 
 	@Override
 	public HashMap<String, Double> getOutputWithNoise(double noiseRange) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
 	public HashMap<String, Double> getOutputWithAmoebaRequest(HashMap<String, Double> amoebaRequest,
 			double noiseRange) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
-	public void setActiveLearning(boolean value) {
-		// TODO Auto-generated method stub
-		
+	public void setActiveLearning(boolean value) {	
 	}
 
 	@Override
 	public void setSelfRequest(HashMap<Percept, Double> request) {
-		// TODO Auto-generated method stub
-		
 	}
 
 	@Override
 	public HashMap<String, Double> getIntput() {
-		// TODO Auto-generated method stub
 		return null;
 	}
 }
\ No newline at end of file
diff --git a/AMOEBAonAMAK/src/experiments/nDimensionsLaunchers/F_N_Launcher.java b/AMOEBAonAMAK/src/experiments/nDimensionsLaunchers/F_N_Launcher.java
index 2e0310717c904b7ffee6afa26c57f1f89c95cb61..317b044f583928d8c3109629c6e47ad6ba2c71e5 100644
--- a/AMOEBAonAMAK/src/experiments/nDimensionsLaunchers/F_N_Launcher.java
+++ b/AMOEBAonAMAK/src/experiments/nDimensionsLaunchers/F_N_Launcher.java
@@ -15,7 +15,6 @@ import kernel.backup.IBackupSystem;
 import kernel.backup.SaveHelperImpl;
 
 
-// TODO: Auto-generated Javadoc
 /**
  * The Class BadContextLauncherEasy.
  */
diff --git a/AMOEBAonAMAK/src/experiments/nDimensionsLaunchers/F_N_Manager.java b/AMOEBAonAMAK/src/experiments/nDimensionsLaunchers/F_N_Manager.java
index b26d63786fa62affc10ce76456644f65f6a74722..331ba5275c774ff131f1d65609f152de6dccfef8 100644
--- a/AMOEBAonAMAK/src/experiments/nDimensionsLaunchers/F_N_Manager.java
+++ b/AMOEBAonAMAK/src/experiments/nDimensionsLaunchers/F_N_Manager.java
@@ -8,7 +8,6 @@ import agents.percept.Percept;
 import kernel.StudiedSystem;
 
 
-// TODO: Auto-generated Javadoc
 /**
  * The Class BadContextManager.
  */
diff --git a/AMOEBAonAMAK/src/ncs/NCS.java b/AMOEBAonAMAK/src/ncs/NCS.java
index 756f21ca22ea3327fee58eb38cb7de2c00454b65..c2e85b02499b4420c6c782508e60e8f0ac600fd9 100644
--- a/AMOEBAonAMAK/src/ncs/NCS.java
+++ b/AMOEBAonAMAK/src/ncs/NCS.java
@@ -5,7 +5,6 @@ import java.io.Serializable;
 import kernel.World;
 
 
-	// TODO: Auto-generated Javadoc
 /**
 	 * Non Cooperative Situation as defined in the AMAS theory.
 	 */