diff --git a/edo/CMakeLists.txt b/edo/CMakeLists.txt
index 9a07cd61..3cb182b3 100644
--- a/edo/CMakeLists.txt
+++ b/edo/CMakeLists.txt
@@ -125,7 +125,7 @@ SET(SAMPLE_SRCS)
 
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(application)
-ADD_SUBDIRECTORY(test)
+#ADD_SUBDIRECTORY(test)
 ADD_SUBDIRECTORY(doc)
 
 ######################################################################################
diff --git a/edo/application/cmaes/main.cpp b/edo/application/cmaes/main.cpp
index 18c3f093..d1f35941 100644
--- a/edo/application/cmaes/main.cpp
+++ b/edo/application/cmaes/main.cpp
@@ -26,7 +26,7 @@ Authors:
 */
 
 #include <eo>
-#include <mo>
+//#include <mo>
 
 #include <eoEvalFuncCounterBounder.h>
 
diff --git a/edo/build_gcc_linux_release b/edo/build_gcc_linux_release
index fb220d04..cf311d46 100755
--- a/edo/build_gcc_linux_release
+++ b/edo/build_gcc_linux_release
@@ -2,6 +2,7 @@
 
 mkdir -p release
 cd release
-cmake ..
+#cmake -DWITH_EIGEN=1 ..
+cmake -DWITH_BOOST=1 ..
 make
 cd ..
diff --git a/edo/src/edoEDA.h b/edo/src/edoEDA.h
index f94e828f..c0c75be2 100644
--- a/edo/src/edoEDA.h
+++ b/edo/src/edoEDA.h
@@ -29,7 +29,7 @@ Authors:
 #define _edoEDA_h
 
 #include <eo>
-#include <mo>
+//#include <mo>
 
 #include <utils/eoRNG.h>
 
diff --git a/edo/src/edoEDASA.h b/edo/src/edoEDASA.h
index b2f0fe70..27ae8062 100644
--- a/edo/src/edoEDASA.h
+++ b/edo/src/edoEDASA.h
@@ -29,7 +29,7 @@ Authors:
 #define _edoEDASA_h
 
 #include <eo>
-#include <mo>
+//#include <mo>
 
 #include <utils/eoRNG.h>
 
diff --git a/edo/src/utils/edoStatNormalMulti.h b/edo/src/utils/edoStatNormalMulti.h
index bc5066ac..d46e97ef 100644
--- a/edo/src/utils/edoStatNormalMulti.h
+++ b/edo/src/utils/edoStatNormalMulti.h
@@ -50,7 +50,7 @@ template < typename EOT >
 class edoStatNormalMulti : public edoDistribStat< edoNormalMulti< EOT > >
 {
 public:
-    typedef typename EOT::AtomType AtomType;
+  //    typedef typename EOT::AtomType AtomType;
 
     using edoDistribStat< edoNormalMulti< EOT > >::value;
 
diff --git a/edo/test/t-edoEstimatorNormalMulti.cpp b/edo/test/t-edoEstimatorNormalMulti.cpp
index 114f8fa1..5c47f5cf 100644
--- a/edo/test/t-edoEstimatorNormalMulti.cpp
+++ b/edo/test/t-edoEstimatorNormalMulti.cpp
@@ -29,7 +29,7 @@ Authors:
 #include <iomanip>
 
 #include <eo>
-#include <mo>
+//#include <mo>
 
 #include <edo>
 
diff --git a/edo/test/t-mean-distance.cpp b/edo/test/t-mean-distance.cpp
index ae6de0eb..4e184f5a 100644
--- a/edo/test/t-mean-distance.cpp
+++ b/edo/test/t-mean-distance.cpp
@@ -33,7 +33,7 @@ Authors:
 #include <fstream>
 
 #include <eo>
-#include <mo>
+//#include <mo>
 
 #include <edo>