diff --git a/cmake_modules/morse_cmake b/cmake_modules/morse_cmake
index 8b867b974fe1f03ff1afa2d3502a41add10d31a9..32c1ba6ae5d7e19d570ac3bd86a24acb82f2081e 160000
--- a/cmake_modules/morse_cmake
+++ b/cmake_modules/morse_cmake
@@ -1 +1 @@
-Subproject commit 8b867b974fe1f03ff1afa2d3502a41add10d31a9
+Subproject commit 32c1ba6ae5d7e19d570ac3bd86a24acb82f2081e
diff --git a/runtime/starpu/control/runtime_control.c b/runtime/starpu/control/runtime_control.c
index 838d6ad841408e2ad781c413c1bcb71e674787de..9ff2f7e9f5b36522746bb5f4aae1eb56d49900cb 100644
--- a/runtime/starpu/control/runtime_control.c
+++ b/runtime/starpu/control/runtime_control.c
@@ -62,12 +62,6 @@ int RUNTIME_init_scheduler( MORSE_context_t *morse, int ncpus, int ncudas, int n
     conf->ncuda = ncudas;
     conf->nopencl = 0;
 
-#if !defined(CHAMELEON_SIMULATION)
-    /* By default, enable calibration */
-    if (!getenv("STARPU_CALIBRATE"))
-        conf->calibrate = 1;
-#endif
-
     /* By default, use the dmdas strategy */
     if (!getenv("STARPU_SCHED")) {
         if (conf->ncuda > 0) {