diff --git a/executables/nr-gnb.c b/executables/nr-gnb.c
index 6e9dd91a59..46e2d3fafe 100644
--- a/executables/nr-gnb.c
+++ b/executables/nr-gnb.c
@@ -412,7 +412,7 @@ void init_eNB_afterRU(void) {
     // map antennas and PRACH signals to gNB RX
     if (0) AssertFatal(gNB->num_RU>0,"Number of RU attached to gNB %d is zero\n",gNB->Mod_id);
 
-    LOG_D(PHY, "Mapping RX ports from %d RUs to gNB %d\n", gNB->num_RU, gNB->Mod_id);
+    LOG_D(NR_PHY, "Mapping RX ports from %d RUs to gNB %d\n", gNB->num_RU, gNB->Mod_id);
 
     for (ru_id=0,aa=0; ru_id<gNB->num_RU; ru_id++) {
       AssertFatal(gNB->RU_list[ru_id]->common.rxdataF != NULL, "RU %d : common.rxdataF is NULL\n", gNB->RU_list[ru_id]->idx);
diff --git a/executables/nr-ru.c b/executables/nr-ru.c
index e3f13cd014..5a4002e609 100644
--- a/executables/nr-ru.c
+++ b/executables/nr-ru.c
@@ -1819,7 +1819,7 @@ static void NRRCconfig_RU(configmodule_interface_t *cfg)
 
   if (RUParamList.numelt > 0) {
     RC.ru = (RU_t **)malloc(RC.nb_RU*sizeof(RU_t *));
-    RC.ru_mask = (1 << NB_RU) - 1;
+    RC.ru_mask = (1 << RC.nb_RU) - 1;
 
     for (int j = 0; j < RC.nb_RU; j++) {
       RC.ru[j] = calloc(1, sizeof(*RC.ru[j]));
diff --git a/executables/nr-softmodem.c b/executables/nr-softmodem.c
index cb6a61eb2b..a934978492 100644
--- a/executables/nr-softmodem.c
+++ b/executables/nr-softmodem.c
@@ -365,7 +365,6 @@ static void get_options(configmodule_interface_t *cfg)
     memset((void *)&RC,0,sizeof(RC));
     /* Read RC configuration file */
     NRRCConfig();
-    NB_RU   = RC.nb_RU;
   }
 }
 
diff --git a/openair1/PHY/phy_extern.h b/openair1/PHY/phy_extern.h
index 8584bf351e..f1e4bb5bcd 100644
--- a/openair1/PHY/phy_extern.h
+++ b/openair1/PHY/phy_extern.h
@@ -63,9 +63,6 @@ static const short primary_synch2[144] = {
     -13477, 29867,  -7292,  -31946, -29523, -14218, 25100,  -21063, -16384, -28378, 27073,  -18459, -26120, -19785, 2448,   -32676,
     -24020, 22287,  -31754, 8085,   32767,  -1,     0,      0,      0,      0,      0,      0,      0,      0,      0,      0};
 
-extern unsigned char NB_RU;
-
-
 static const char NB_functions[7][20] = {
     "eNodeB_3GPP",
     "eNodeB_3GPP_BBU",
diff --git a/openair1/PHY/phy_vars.h b/openair1/PHY/phy_vars.h
index 85d2d2a59f..61b8361d21 100644
--- a/openair1/PHY/phy_vars.h
+++ b/openair1/PHY/phy_vars.h
@@ -30,7 +30,6 @@
 
 PHY_VARS_UE ***PHY_vars_UE_g;
 UL_RCC_IND_t UL_RCC_INFO;
-unsigned char NB_RU=0;
 int number_of_cards;
 uint8_t max_turbo_iterations=4;