diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index 627ed13f0c3c9085c060dfa4e4b051715de3bb0b..001d14add25b96457d5eec265debffc31761d965 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -634,7 +634,6 @@ add_boolean_option(PHYSIM                  True  "for L1 simulators (dlsim, ulsi
 add_boolean_option(PHY_CONTEXT             True "not clear: must remain False for dlsim")
 add_boolean_option(PHY_EMUL                False "not clear: must remain False for dlsim")
 add_boolean_option(PUCCH                   True "????")
-add_boolean_option(RANDOM_BF               False "????")
 add_boolean_option(SMBV                    False "Rohde&Schwarz SMBV100A vector signal generator")
 add_boolean_option(DEBUG_PHY               False "Enable PHY layer debugging options")
 add_boolean_option(DEBUG_PHY_PROC          False "Enable debugging of PHY layer procedures")
diff --git a/cmake_targets/epc_test/CMakeLists.template b/cmake_targets/epc_test/CMakeLists.template
index 4755e3d646138c5ebfefcfa3e32b97aca07388d8..aec0caaa3bb94e56fd18623914d864f3c4ae0426 100644
--- a/cmake_targets/epc_test/CMakeLists.template
+++ b/cmake_targets/epc_test/CMakeLists.template
@@ -53,7 +53,6 @@ set (  PHY_CONTEXT False )
 set (  PHY_EMUL False )
 set (  PHYSIM True )
 set (  PUCCH True )
-set (  RANDOM_BF False )
 set (  RF_BOARD "False" )
 set (  RLC_STOP_ON_LOST_PDU False )
 set (  RRC_ASN1_VERSION "Rel10" )
diff --git a/cmake_targets/lte-simulators/CMakeLists.txt b/cmake_targets/lte-simulators/CMakeLists.txt
index 198ba49a9caa6670efdd4f369bdfcba292420e8a..ca754449d7f9c6bbea10e1dcf726160df18a9f97 100644
--- a/cmake_targets/lte-simulators/CMakeLists.txt
+++ b/cmake_targets/lte-simulators/CMakeLists.txt
@@ -6,7 +6,6 @@ set(XFORMS True)
 set(ENABLE_ITTI False)
 set(DEBUG_PHY False)
 set(MU_RECIEVER False)
-set(RANDOM_BF False)
 set(NAS_UE False)
 set(MESSAGE_CHART_GENERATOR False)
 
diff --git a/cmake_targets/oaisim_build_oai/CMakeLists.template b/cmake_targets/oaisim_build_oai/CMakeLists.template
index 511cc685831449ab92715376b656ea8f306ce28a..4df8056c6eec6bfa360d059d35857fc697de1951 100644
--- a/cmake_targets/oaisim_build_oai/CMakeLists.template
+++ b/cmake_targets/oaisim_build_oai/CMakeLists.template
@@ -52,7 +52,6 @@ set (  PHY_CONTEXT False )
 set (  PHY_EMUL False )
 set (  PHYSIM True )
 set (  PUCCH True )
-set (  RANDOM_BF False )
 set (  RF_BOARD "False" )
 set (  RLC_STOP_ON_LOST_PDU False )
 set (  RRC_ASN1_VERSION "Rel10" )
diff --git a/cmake_targets/oaisim_mme_build_oai/CMakeLists.template b/cmake_targets/oaisim_mme_build_oai/CMakeLists.template
index efc98faedd8517a02ddc6365d2fa78927ce467b0..618468d295225283f7803c07dfb3a55f59819111 100644
--- a/cmake_targets/oaisim_mme_build_oai/CMakeLists.template
+++ b/cmake_targets/oaisim_mme_build_oai/CMakeLists.template
@@ -53,7 +53,6 @@ set (  PHY_CONTEXT False )
 set (  PHY_EMUL False )
 set (  PHYSIM False )
 set (  PUCCH False )
-set (  RANDOM_BF False )
 set (  RF_BOARD "False" )
 set (  RRC_ASN1_VERSION "Rel10" )
 set (  RLC_STOP_ON_LOST_PDU False )
diff --git a/cmake_targets/oaisim_noS1_build_oai/CMakeLists.template b/cmake_targets/oaisim_noS1_build_oai/CMakeLists.template
index 4c7489a08ab9a8198adf65fd3d0350e3eff75167..dec2f7b277e0ae562a65ab0b2c6ade21f069bd52 100644
--- a/cmake_targets/oaisim_noS1_build_oai/CMakeLists.template
+++ b/cmake_targets/oaisim_noS1_build_oai/CMakeLists.template
@@ -54,7 +54,6 @@ set (  PHY_CONTEXT False )
 set (  PHY_EMUL False )
 set (  PHYSIM True )
 set (  PUCCH True )
-set (  RANDOM_BF False )
 set (  RF_BOARD "False" )
 set (  RRC_ASN1_VERSION "Rel10" )
 set (  RLC_STOP_ON_LOST_PDU False )
diff --git a/cmake_targets/s1c_mme_test/CMakeLists.template b/cmake_targets/s1c_mme_test/CMakeLists.template
index f425f14185f8345fee5d94b2ab4ea4e3dd4db579..c9ef0ec3f2ce618d920e352db6d2a46a7c6e2809 100644
--- a/cmake_targets/s1c_mme_test/CMakeLists.template
+++ b/cmake_targets/s1c_mme_test/CMakeLists.template
@@ -53,7 +53,6 @@ set (  PHY_CONTEXT False )
 set (  PHY_EMUL False )
 set (  PHYSIM True )
 set (  PUCCH True )
-set (  RANDOM_BF False )
 set (  RF_BOARD "False" )
 set (  RLC_STOP_ON_LOST_PDU False )
 set (  RRC_ASN1_VERSION "Rel10" )