diff --git a/edo/CMakeLists.txt b/edo/CMakeLists.txt
index 9a07cd619..3cb182b3d 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 4da2fdbed..97d1d1110 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 12e06bd01..a1a0f53b9 100755
--- a/edo/build_gcc_linux_release
+++ b/edo/build_gcc_linux_release
@@ -2,6 +2,8 @@
 
 mkdir -p release
 cd release
-cmake -DWITH_BOOST=1 ..
+cmake -DWITH_EIGEN=1 ..
+#cmake -DWITH_BOOST=1 ..
+
 make
 cd ..
diff --git a/edo/install.cmake-dist b/edo/install.cmake-dist
index b4f532113..35cc06172 100644
--- a/edo/install.cmake-dist
+++ b/edo/install.cmake-dist
@@ -2,19 +2,9 @@
 
 #  directory we need to build project
 SET(EO_DIR "<<PATH_TO_EO>>" CACHE PATH "EO directory" FORCE)
-SET(MO_DIR "<<PATH_TO_MO>>" CACHE PATH "MO directory" FORCE)
 
 # automagically set parameters, do not edit
 
 SET(EO_INCLUDE_DIRS "${EO_DIR}/src" CACHE PATH "EO include directory" FORCE)
 SET(EO_LIBRARY_DIRS "${EO_DIR}/release/lib" CACHE PATH "EO library directory" FORCE)
 SET(EO_LIBRARIES eoutils eo es ga cma gcov) # do not use quotes around this list or it will fail
-
-SET(MO_INCLUDE_DIRS "${MO_DIR}/src" CACHE PATH "MO include directory" FORCE)
-SET(MO_LIBRARY_DIRS "${MO_DIR}/release/lib" CACHE PATH "MO library directory" FORCE)
-#SET(MO_LIBRARIES "mo") # no library is generated when building MO
-
-# ... or rather use pkg-config (dont forget to comment the code above)
-
-#PKG_CHECK_MODULES(EO eo REQUIRED)
-#PKG_CHECK_MODULES(MO mo REQUIRED)
diff --git a/edo/src/edoEDASA.h b/edo/src/edoEDASA.h
index 82880b3cb..1966d54db 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/edoNormalMono.h b/edo/src/edoNormalMono.h
index eeed4af38..126044682 100644
--- a/edo/src/edoNormalMono.h
+++ b/edo/src/edoNormalMono.h
@@ -46,7 +46,11 @@ Authors:
 template < typename EOT >
 class edoNormalMono : public edoDistrib< EOT >
 {
-public:
+public:    
+    edoNormalMono()
+      : _mean(EOT(1,0)), _variance(EOT(1,1))
+    {}
+
     edoNormalMono( const EOT& mean, const EOT& variance )
         : _mean(mean), _variance(variance)
     {
diff --git a/edo/src/utils/edoStatNormalMulti.h b/edo/src/utils/edoStatNormalMulti.h
index 0de29700e..961fd7cba 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 114f8fa17..5c47f5cf5 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 ae6de0eb3..4e184f5a8 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>