diff --git a/common/openairinterface5g_limits.h b/common/openairinterface5g_limits.h
index f5d9c21ad5f7d3f817bfb13b43ad7c532b7f8bd8..485c775b77109b22facb4a6bb9396c911ee879c0 100644
--- a/common/openairinterface5g_limits.h
+++ b/common/openairinterface5g_limits.h
@@ -14,8 +14,6 @@
 #        define NUMBER_OF_SCH_STATS_MAX 16
 #        define NUMBER_OF_NR_SCH_STATS_MAX 16
 
-#        define NUMBER_OF_NR_PDCCH_MAX 16
-
 #define MAX_MANAGED_ENB_PER_MOBILE  2
 #define MAX_MANAGED_GNB_PER_MOBILE  2
 
diff --git a/executables/nr-gnb.c b/executables/nr-gnb.c
index 9660f89f5c9a3513b5eddc6bfdfe41577dc7f1fe..645091eeae4d431d1bed98811d47a51fcdc0e965 100644
--- a/executables/nr-gnb.c
+++ b/executables/nr-gnb.c
@@ -206,14 +206,6 @@ void rx_func(void *param) {
         gNB->pucch[j]->pucch_pdu.rnti = 0;
         pucch_removed++;
       }
-#if 0
-    for (j = 0; j < NUMBER_OF_NR_PDCCH_MAX; j++)
-      gNB->pdcch_pdu[j].frame = -1;
-    for (j = 0; j < NUMBER_OF_NR_PDCCH_MAX; j++)
-      gNB->ul_pdcch_pdu[j].frame = -1;
-    for (j = 0; j < NUMBER_OF_NR_PRACH_MAX; j++)
-      gNB->prach_vars.list[j].frame = -1;
-#endif
   }
   if (rnti_to_remove_count) LOG_W(NR_PHY, "to remove rnti_to_remove_count=%d, up_removed=%d down_removed=%d pucch_removed=%d\n", rnti_to_remove_count, up_removed, down_removed, pucch_removed);
   rnti_to_remove_count = 0;
diff --git a/openair1/PHY/NR_TRANSPORT/nr_prach.c b/openair1/PHY/NR_TRANSPORT/nr_prach.c
index b3d492d0258c13efe597a9efbf122db3ff209d4c..461f0126874e4d0c69efa89f8623ffa7a484affa 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_prach.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_prach.c
@@ -39,20 +39,19 @@ extern uint16_t prach_root_sequence_map_abc[138];
 extern uint16_t nr_du[838];
 extern const char *prachfmt[];
 
-void init_prach_list(PHY_VARS_gNB *gNB) {
-
+void init_prach_list(PHY_VARS_gNB *gNB)
+{
   AssertFatal(gNB!=NULL,"gNB is null\n");
   for (int i=0; i<NUMBER_OF_NR_PRACH_MAX; i++){
-		gNB->prach_vars.list[i].frame = -1;
-		gNB->prach_vars.list[i].slot  = -1;
-	}
+    gNB->prach_vars.list[i].frame = -1;
+    gNB->prach_vars.list[i].slot  = -1;
+  }
 }
 
-void free_nr_prach_entry(PHY_VARS_gNB *gNB, int prach_id) {
-
+void free_nr_prach_entry(PHY_VARS_gNB *gNB, int prach_id)
+{
   gNB->prach_vars.list[prach_id].frame = -1;
-	gNB->prach_vars.list[prach_id].slot  = -1;
-
+  gNB->prach_vars.list[prach_id].slot  = -1;
 }
 
 int16_t find_nr_prach(PHY_VARS_gNB *gNB,int frame, int slot, find_type_t type) {
diff --git a/openair1/PHY/defs_gNB.h b/openair1/PHY/defs_gNB.h
index 739eddc052b64dc07d0fc669c3a0394ff1578bfb..136daf44aac0fe9261b892fb1ee4e743bd58fbca 100644
--- a/openair1/PHY/defs_gNB.h
+++ b/openair1/PHY/defs_gNB.h
@@ -626,8 +626,6 @@ typedef struct PHY_VARS_gNB_s {
   NR_gNB_PUSCH       *pusch_vars[NUMBER_OF_NR_ULSCH_MAX];
   NR_gNB_PUCCH_t     **pucch;
   NR_gNB_SRS_t       **srs;
-  NR_gNB_PDCCH_t     pdcch_pdu[NUMBER_OF_NR_PDCCH_MAX];
-  NR_gNB_UL_PDCCH_t  ul_pdcch_pdu[NUMBER_OF_NR_PDCCH_MAX];
   NR_gNB_DLSCH_t     *dlsch[NUMBER_OF_NR_DLSCH_MAX][2];    // Nusers times two spatial streams
   NR_gNB_ULSCH_t     *ulsch[NUMBER_OF_NR_ULSCH_MAX];  // [Nusers times]
   /// statistics for DLSCH measurement collection