diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index 990365be5598246c4500f4972cb156bdb2b8fa2f..669387488d31c927dcd733a5dc03132e6b083bbd 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -389,7 +389,6 @@ 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(UE_BUILD False "????")
 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")
 add_boolean_option(MESSAGE_CHART_GENERATOR False "For generating sequence diagrams")
@@ -423,7 +422,7 @@ add_boolean_option(OPENAIR_LTE             True "Seems legacy: keep it to true")
 ##########################
 # PHY options
 ##########################
-add_boolean_option(DRIVER2013              True "????")
+add_boolean_option(DRIVER2013              True "only relevant for EXMIMO")
 add_boolean_option(ENABLE_FXP              True "????")
 add_boolean_option(ENABLE_NEW_MULTICAST    False "specific to oaisim")
 add_boolean_option(EXMIMO_IOT              True "????")
diff --git a/cmake_targets/autotests/test.0101/CMakeLists.txt b/cmake_targets/autotests/test.0101/CMakeLists.txt
index 84dff0bc38ea5d8b67b0f08d9e306a1597485c56..d4c2d85cdc6bea8e426a5ae1310641b5080bbe2b 100644
--- a/cmake_targets/autotests/test.0101/CMakeLists.txt
+++ b/cmake_targets/autotests/test.0101/CMakeLists.txt
@@ -101,7 +101,6 @@ set ( TRACE_RLC_UM_PDU True )
 set ( TRACE_RLC_UM_RX False )
 set ( TRACE_RLC_UM_SEGMENT False )
 set ( TRACE_RLC_UM_TX_STATUS False )
-set ( UE_BUILD False )
 set ( USE_3GPP_ADDR_AS_LINK_ADDR False )
 set ( USE_MME False )
 set ( USER_MODE True )
diff --git a/cmake_targets/autotests/test.0102/CMakeLists.txt b/cmake_targets/autotests/test.0102/CMakeLists.txt
index bd1ffacc034b943d31f043c4e3f5abfd579edeaa..37e9dc379119d6fe1f498f3d711b9761ebc9c7c9 100644
--- a/cmake_targets/autotests/test.0102/CMakeLists.txt
+++ b/cmake_targets/autotests/test.0102/CMakeLists.txt
@@ -101,7 +101,6 @@ set ( TRACE_RLC_UM_PDU True )
 set ( TRACE_RLC_UM_RX False )
 set ( TRACE_RLC_UM_SEGMENT False )
 set ( TRACE_RLC_UM_TX_STATUS False )
-set ( UE_BUILD False )
 set ( USE_3GPP_ADDR_AS_LINK_ADDR False )
 set ( USE_MME False )
 set ( USER_MODE True )
diff --git a/cmake_targets/autotests/test.0103/CMakeLists.txt b/cmake_targets/autotests/test.0103/CMakeLists.txt
index 426705a8696a0fb61b4b5d5fcb8cd915f75fd077..2d4e85aec360f405d779eff4c8a6dce924551175 100644
--- a/cmake_targets/autotests/test.0103/CMakeLists.txt
+++ b/cmake_targets/autotests/test.0103/CMakeLists.txt
@@ -101,7 +101,6 @@ set ( TRACE_RLC_UM_PDU False )
 set ( TRACE_RLC_UM_RX False )
 set ( TRACE_RLC_UM_SEGMENT False )
 set ( TRACE_RLC_UM_TX_STATUS False )
-set ( UE_BUILD False )
 set ( USE_3GPP_ADDR_AS_LINK_ADDR False )
 set ( USE_MME False )
 set ( USER_MODE True )
diff --git a/cmake_targets/autotests/test.0106/CMakeLists.txt b/cmake_targets/autotests/test.0106/CMakeLists.txt
index 577b533b8568a50f11a8eebcf59777c5a620b8e3..5e12f11149cfc7e41a7fe3b46c951c7a9a89b1af 100644
--- a/cmake_targets/autotests/test.0106/CMakeLists.txt
+++ b/cmake_targets/autotests/test.0106/CMakeLists.txt
@@ -64,7 +64,6 @@ set(SECU False)
 set(SMBV False)
 set(SPECTRA False)
 set(TEST_OMG False)
-set(UE_BUILD False)
 set(USE_3GPP_ADDR_AS_LINK_ADDR False)
 set(USE_MME False)
 set(USER_MODE True)
diff --git a/cmake_targets/autotests/test.0107/CMakeLists.txt b/cmake_targets/autotests/test.0107/CMakeLists.txt
index 43c45ed09676d0368705ef5e9ac0296ec0621ac3..aa4f098d7834ec7b380a618622e235ba21d11be6 100644
--- a/cmake_targets/autotests/test.0107/CMakeLists.txt
+++ b/cmake_targets/autotests/test.0107/CMakeLists.txt
@@ -101,7 +101,6 @@ set ( TRACE_RLC_UM_PDU True )
 set ( TRACE_RLC_UM_RX False )
 set ( TRACE_RLC_UM_SEGMENT False )
 set ( TRACE_RLC_UM_TX_STATUS False )
-set ( UE_BUILD False )
 set ( USE_3GPP_ADDR_AS_LINK_ADDR False )
 set ( USE_MME False )
 set ( USER_MODE True )
diff --git a/cmake_targets/autotests/test.0108/CMakeLists.txt b/cmake_targets/autotests/test.0108/CMakeLists.txt
index e3209539e1a04b51c1852fc6516c27b8a0294dcc..a0648e17676a248b49d445d1ecf569b9682ba330 100644
--- a/cmake_targets/autotests/test.0108/CMakeLists.txt
+++ b/cmake_targets/autotests/test.0108/CMakeLists.txt
@@ -64,7 +64,6 @@ set(SECU False)
 set(SMBV False)
 set(SPECTRA False)
 set(TEST_OMG False)
-set(UE_BUILD False)
 set(USE_3GPP_ADDR_AS_LINK_ADDR False)
 set(USE_MME False)
 set(USER_MODE True)
diff --git a/cmake_targets/autotests/test.0114/CMakeLists.txt b/cmake_targets/autotests/test.0114/CMakeLists.txt
index 5eadb5693fcb17dcb940e433713038eeba89da70..1f85bc104297db08ab8a5cd4f4c0e5dcbb29c8c0 100644
--- a/cmake_targets/autotests/test.0114/CMakeLists.txt
+++ b/cmake_targets/autotests/test.0114/CMakeLists.txt
@@ -64,7 +64,6 @@ set(SECU False)
 set(SMBV False)
 set(SPECTRA False)
 set(TEST_OMG False)
-set(UE_BUILD False)
 set(USE_3GPP_ADDR_AS_LINK_ADDR False)
 set(USE_MME False)
 set(USER_MODE True)
diff --git a/cmake_targets/autotests/test.0115/CMakeLists.txt b/cmake_targets/autotests/test.0115/CMakeLists.txt
index 8cb05b423ac64ebf6d11befc7c302939be01d85d..147c01f852cbb739172fbba9193aae750a7853b2 100644
--- a/cmake_targets/autotests/test.0115/CMakeLists.txt
+++ b/cmake_targets/autotests/test.0115/CMakeLists.txt
@@ -101,7 +101,6 @@ set ( TRACE_RLC_UM_PDU True )
 set ( TRACE_RLC_UM_RX False )
 set ( TRACE_RLC_UM_SEGMENT False )
 set ( TRACE_RLC_UM_TX_STATUS False )
-set ( UE_BUILD False )
 set ( USE_3GPP_ADDR_AS_LINK_ADDR False )
 set ( USE_MME False )
 set ( USER_MODE True )
diff --git a/cmake_targets/autotests/test.0120/CMakeLists.txt b/cmake_targets/autotests/test.0120/CMakeLists.txt
index bd1ffacc034b943d31f043c4e3f5abfd579edeaa..37e9dc379119d6fe1f498f3d711b9761ebc9c7c9 100644
--- a/cmake_targets/autotests/test.0120/CMakeLists.txt
+++ b/cmake_targets/autotests/test.0120/CMakeLists.txt
@@ -101,7 +101,6 @@ set ( TRACE_RLC_UM_PDU True )
 set ( TRACE_RLC_UM_RX False )
 set ( TRACE_RLC_UM_SEGMENT False )
 set ( TRACE_RLC_UM_TX_STATUS False )
-set ( UE_BUILD False )
 set ( USE_3GPP_ADDR_AS_LINK_ADDR False )
 set ( USE_MME False )
 set ( USER_MODE True )
diff --git a/cmake_targets/epc_build_oai/CMakeLists.template b/cmake_targets/epc_build_oai/CMakeLists.template
index 21b0797454059ce8e962a0f1841d3798488958fe..c1d80ec1ae045ba8502bbc64a0231cd5d0fcd4d1 100644
--- a/cmake_targets/epc_build_oai/CMakeLists.template
+++ b/cmake_targets/epc_build_oai/CMakeLists.template
@@ -79,7 +79,6 @@ set (  SECU False )
 set (  SMBV False )
 set (  SPECTRA False )
 set (  TEST_OMG False )
-set (  UE_BUILD False )
 set (  UPDATE_RELEASE_9 True)
 set (  UPDATE_RELEASE_10 True)
 set (  USE_3GPP_ADDR_AS_LINK_ADDR False )
diff --git a/cmake_targets/oaisim_mme_build_oai/CMakeLists.template b/cmake_targets/oaisim_mme_build_oai/CMakeLists.template
index edd037ba02b5bcbcbaa19647be9f8d34e2e7513f..dcac0c4f9793879f117703ba548c397a26a185ae 100644
--- a/cmake_targets/oaisim_mme_build_oai/CMakeLists.template
+++ b/cmake_targets/oaisim_mme_build_oai/CMakeLists.template
@@ -76,7 +76,6 @@ set (  SECU False )
 set (  SMBV False )
 set (  SPECTRA False )
 set (  TEST_OMG False )
-set (  UE_BUILD False )
 set (  UPDATE_RELEASE_9 True)
 set (  UPDATE_RELEASE_10 True)
 set (  USE_3GPP_ADDR_AS_LINK_ADDR False )
diff --git a/cmake_targets/oaisim_noS1_build_oai/CMakeLists.template b/cmake_targets/oaisim_noS1_build_oai/CMakeLists.template
index 7804abc6e74719d2b0047db71dea2c2986ece648..85a76d5d417678d3ea39dab039af723667d40a4a 100644
--- a/cmake_targets/oaisim_noS1_build_oai/CMakeLists.template
+++ b/cmake_targets/oaisim_noS1_build_oai/CMakeLists.template
@@ -74,7 +74,6 @@ set (  SECU False )
 set (  SMBV False )
 set (  SPECTRA False )
 set (  TEST_OMG False )
-set (  UE_BUILD False )
 set (  USE_3GPP_ADDR_AS_LINK_ADDR False )
 set (  USE_MME "R10" )
 set (  USER_MODE True )