diff --git a/executables/nr-gnb.c b/executables/nr-gnb.c
index 38315bd578..53c0500f9c 100644
--- a/executables/nr-gnb.c
+++ b/executables/nr-gnb.c
@@ -45,7 +45,6 @@
 #include "PHY/INIT/nr_phy_init.h"
 
 #include "PHY/defs_gNB.h"
-#include "SCHED/sched_eNB.h"
 #include "SCHED_NR/sched_nr.h"
 #include "SCHED_NR/fapi_nr_l1.h"
 #include "PHY/NR_TRANSPORT/nr_transport_proto.h"
@@ -75,10 +74,8 @@
 #include "UTIL/MATH/oml.h"
 #include "common/utils/LOG/vcd_signal_dumper.h"
 #include "UTIL/OPT/opt.h"
-#include "enb_config.h"
 #include "gnb_paramdef.h"
 
-#include "s1ap_eNB.h"
 #include "SIMULATION/ETH_TRANSPORT/proto.h"
 #include <executables/softmodem-common.h>
 
diff --git a/executables/nr-ru.c b/executables/nr-ru.c
index dbb0c30a95..a5a670916e 100644
--- a/executables/nr-ru.c
+++ b/executables/nr-ru.c
@@ -65,7 +65,6 @@ static int DEFRUTPCORES[] = {-1,-1,-1,-1};
 #include "GNB_APP/gnb_paramdef.h"
 #include "common/config/config_userapi.h"
 
-#include "s1ap_eNB.h"
 #include "SIMULATION/ETH_TRANSPORT/proto.h"
 #include <openair1/PHY/TOOLS/phy_scope_interface.h>
 
diff --git a/executables/nr-softmodem-common.h b/executables/nr-softmodem-common.h
index 5ff6a0b323..f01bf320d7 100644
--- a/executables/nr-softmodem-common.h
+++ b/executables/nr-softmodem-common.h
@@ -30,7 +30,6 @@
 #include "PHY/types.h"
 #include <threadPool/thread-pool.h>
 
-#include "s1ap_eNB.h"
 #include "SIMULATION/ETH_TRANSPORT/proto.h"
 
 /* help strings definition for command line options, used in CMDLINE_XXX_DESC macros and printed when -h option is used */
diff --git a/openair2/GNB_APP/gnb_config.c b/openair2/GNB_APP/gnb_config.c
index 560d78ca85..40aa306e45 100644
--- a/openair2/GNB_APP/gnb_config.c
+++ b/openair2/GNB_APP/gnb_config.c
@@ -41,7 +41,6 @@
 #include "UTIL/OTG/otg.h"
 #include "UTIL/OTG/otg_externs.h"
 #include "intertask_interface.h"
-#include "s1ap_eNB.h"
 #include "ngap_gNB.h"
 #include "sctp_eNB_task.h"
 #include "sctp_default_values.h"
diff --git a/openair2/LAYER2/NR_MAC_UE/config_ue.c b/openair2/LAYER2/NR_MAC_UE/config_ue.c
index 766cfa1ecb..8e245069cc 100644
--- a/openair2/LAYER2/NR_MAC_UE/config_ue.c
+++ b/openair2/LAYER2/NR_MAC_UE/config_ue.c
@@ -20,7 +20,7 @@
  */
 
 /* \file config_ue.c
- * \brief UE and eNB configuration performed by RRC or as a consequence of RRC procedures
+ * \brief UE configuration performed by RRC or as a consequence of RRC procedures
  * \author R. Knopp, K.H. HSU
  * \date 2018
  * \version 0.1
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
index 22a2b034e6..6faa7e9d80 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
@@ -20,7 +20,7 @@
  */
 
 /*! \file gNB_scheduler_bch.c
- * \brief procedures related to eNB for the BCH transport channel
+ * \brief procedures related to gNB for the BCH transport channel
  * \author  Navid Nikaein and Raymond Knopp, WEI-TAI CHEN
  * \date 2010 - 2014, 2018
  * \email: navid.nikaein@eurecom.fr, kroempa@gmail.com
@@ -42,7 +42,6 @@
 
 
 #define ENABLE_MAC_PAYLOAD_DEBUG
-#define DEBUG_eNB_SCHEDULER 1
 
 #include "common/ran_context.h"