diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index 723ad38d67f1cb3113dc3ac13bf6ae466d108ff2..6cce5e306e2c665f217e3e39c80be498ba9ef322 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -597,6 +597,7 @@ add_boolean_option(NAS_ADDRESS_FIX False "specific to oaisim: for nasmesh driver
 add_boolean_option(NAS_NETLINK False "???? Must be True to compile nasmesh driver without rtai")
 add_boolean_option(OAISIM False "specific to oaisim")
 add_boolean_option(OAI_NW_DRIVER_USE_NETLINK True "????")
+add_boolean_option(EMULATE_RF True "allows to run lte-softmodem without HW")
 
 add_boolean_option(USE_MME False "this flag is used only one time in lte-softmodem.c")
 add_list_string_option(PACKAGE_NAME "NotDefined" "As per attribute name")
diff --git a/common/utils/itti/intertask_interface.c b/common/utils/itti/intertask_interface.c
index fc366f6057e284c81bb62f77ac5d532ab0fc779d..5462c97523234d500861836664df1122bcbe4b09 100644
--- a/common/utils/itti/intertask_interface.c
+++ b/common/utils/itti/intertask_interface.c
@@ -99,9 +99,6 @@ const int itti_debug = (ITTI_DEBUG_ISSUES | ITTI_DEBUG_MP_STATISTICS);
 # define ITTI_MEM_SIZE      (16 * 1024 * 1024)
 #endif
 
-#ifndef EMULATE_RF
-#define EMULATE_RF
-#endif
 
 typedef enum task_state_s {
   TASK_STATE_NOT_CONFIGURED, TASK_STATE_STARTING, TASK_STATE_READY, TASK_STATE_ENDED, TASK_STATE_MAX,
diff --git a/openair1/PHY/defs.h b/openair1/PHY/defs.h
index a21f3b137861f0c21788bd8c2275134e5c64a86e..f8645fec97e81197b67c8262be8062d454698fd5 100644
--- a/openair1/PHY/defs.h
+++ b/openair1/PHY/defs.h
@@ -676,8 +676,8 @@ typedef enum {
   REMOTE_MBP_IF5  =2,
   REMOTE_IF4p5    =3,
   REMOTE_IF1pp    =4,
-  MAX_RU_IF_TYPES =5,
-  EMULATE_RF      =6
+  MAX_RU_IF_TYPES =5
+  //EMULATE_RF      =6
 } RU_if_south_t;
 
 typedef struct RU_t_s{
diff --git a/targets/COMMON/create_tasks.c b/targets/COMMON/create_tasks.c
index 65aed76742358c20c5c16934cd3bcd0bf16848ab..25b5828e0647ac540e17483e5fc31b696aa44a85 100644
--- a/targets/COMMON/create_tasks.c
+++ b/targets/COMMON/create_tasks.c
@@ -40,9 +40,6 @@
 # endif
 # include "enb_app.h"
 
-#ifndef EMULATE_RF
-#define EMULATE_RF
-#endif
 
 int create_tasks(uint32_t enb_nb, uint32_t ue_nb)
 {
diff --git a/targets/RT/USER/lte-ru.c b/targets/RT/USER/lte-ru.c
index e196584e25b0b30b6f794ebbef894d4310988b0a..0b5a1e6087cadea0465a99c67bf4ca6c477830da 100644
--- a/targets/RT/USER/lte-ru.c
+++ b/targets/RT/USER/lte-ru.c
@@ -110,9 +110,6 @@ unsigned short config_frames[4] = {2,9,11,13};
 
 #include "T.h"
 
-#ifndef EMULATE_RF
-#define EMULATE_RF
-#endif
 
 extern volatile int                    oai_exit;
 extern int numerology;