diff --git a/common/utils/itti/timer.c b/common/utils/itti/timer.c
index b1314696b350fcc74078eccb04435e748f4454ed..c34719011a6d2c7f981b0601824764f922148871 100644
--- a/common/utils/itti/timer.c
+++ b/common/utils/itti/timer.c
@@ -243,9 +243,6 @@ int timer_init(void)
     STAILQ_INIT(&timer_desc.timer_queue);
     pthread_mutex_init(&timer_desc.timer_list_mutex, NULL);
 
-    timer_desc.timeout.tv_sec = MME_TIMER_TIMEOUT_S;
-    timer_desc.timeout.tv_nsec = MME_TIMER_TIMEOUT_NS;
-
     TMR_DEBUG("Initializing TIMER task interface: DONE\n");
     return 0;
 }
diff --git a/common/utils/itti/timer.h b/common/utils/itti/timer.h
index 4acff6b8098fd95b203a9aaa12b7fadf6e860bd0..c4504a8a71c65c2854a0c0715238d0e70ebf30c5 100644
--- a/common/utils/itti/timer.h
+++ b/common/utils/itti/timer.h
@@ -28,8 +28,6 @@
 
 *******************************************************************************/
 
-#include "mme_config.h"
-
 #ifndef TIMER_H_
 #define TIMER_H_
 
diff --git a/openair-cn/NAS/nas_main.c b/openair-cn/NAS/nas_main.c
index 5f70a7608f4420f58a2a4fd8b7a3df0b46707fdc..1ea624d9373ecf1f79417e1dd7709b7c9802ca4c 100644
--- a/openair-cn/NAS/nas_main.c
+++ b/openair-cn/NAS/nas_main.c
@@ -5,6 +5,7 @@
 #include <string.h>
 
 #include "intertask_interface.h"
+#include "mme_config.h"
 
 #include "nas_defs.h"
 
diff --git a/openair-cn/UTILS/mme_config.c b/openair-cn/UTILS/mme_config.c
index 5c96d83236d04cd3eb807a2e60254a68931ed344..5529a2e731839f0852db372ca5b53b4dd6354368 100644
--- a/openair-cn/UTILS/mme_config.c
+++ b/openair-cn/UTILS/mme_config.c
@@ -42,6 +42,7 @@
 #include <arpa/inet.h> /* To provide inet_addr */
 
 #include "mme_config.h"
+#include "intertask_interface_conf.h"
 
 mme_config_t mme_config;
 
diff --git a/openair-cn/UTILS/mme_default_values.h b/openair-cn/UTILS/mme_default_values.h
index 30e827e2c559075bd388be1228ab3a648fe50a5a..0be05d168322c30b4f63468aec1498abac5e1689 100644
--- a/openair-cn/UTILS/mme_default_values.h
+++ b/openair-cn/UTILS/mme_default_values.h
@@ -34,8 +34,6 @@
 /*******************************************************************************
  * Timer Constants
  ******************************************************************************/
-#define MME_TIMER_TIMEOUT_NS   (1000)
-#define MME_TIMER_TIMEOUT_S    (0)
 #define MME_STATISTIC_TIMER_S  (60)
 
 /*******************************************************************************
@@ -82,16 +80,6 @@
 
 #define RELATIVE_CAPACITY       (15)
 
-/*******************************************************************************
- * Intertask Interface Constants
- ******************************************************************************/
-
-#define ITTI_QUEUE_SIZE_PER_TASK (5 * 1024 * 1024) /* Limit the queue size to 5M */
-#define ITTI_PORT                (10007)
-/* This is the queue size for signal dumper */
-#define ITTI_QUEUE_SIZE_MAX      (1 * 1024 * 1024) /* 1 MBytes */
-#define ITTI_DUMP_MAX_CON        (5)    /* Max connections in parallel */
-
 /*******************************************************************************
  * IPv4 Constants
  ******************************************************************************/