diff --git a/openair2/COMMON/mac_messages_types.h b/openair2/COMMON/mac_messages_types.h
index f20ff5b600..668daad813 100644
--- a/openair2/COMMON/mac_messages_types.h
+++ b/openair2/COMMON/mac_messages_types.h
@@ -159,15 +159,9 @@ typedef struct RrcMacCcchDataInd_s {
 } RrcMacCcchDataInd;
 
 typedef struct NRRrcMacCcchDataInd_s {
-  uint32_t  frame;
-  uint8_t   slot;
   uint16_t  rnti;
   uint32_t  sdu_size;
   uint8_t   sdu[CCCH_SDU_SIZE];
-  OCTET_STRING_t *du_to_cu_rrc_container;
-  uint8_t   gnb_index;
-  int       CC_id;
-  uint64_t  nr_cellid;
 } NRRrcMacCcchDataInd;
 
 typedef struct RrcMacMcchDataReq_s {
diff --git a/openair2/LAYER2/NR_MAC_UE/main_ue_nr.c b/openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
index c34fae3cf3..3f565a1b17 100644
--- a/openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
+++ b/openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
@@ -54,12 +54,6 @@ static void send_srb0_rrc(int rnti, const uint8_t *sdu, sdu_size_t sdu_len, void
   memcpy(NR_RRC_MAC_CCCH_DATA_IND(message_p).sdu, sdu, sdu_len);
   NR_RRC_MAC_CCCH_DATA_IND(message_p).sdu_size = sdu_len;
   NR_RRC_MAC_CCCH_DATA_IND(message_p).rnti = rnti;
-  NR_RRC_MAC_CCCH_DATA_IND(message_p).gnb_index = 0;
-  NR_RRC_MAC_CCCH_DATA_IND(message_p).frame = 0;
-  NR_RRC_MAC_CCCH_DATA_IND(message_p).slot = 0;
-  NR_RRC_MAC_CCCH_DATA_IND(message_p).du_to_cu_rrc_container = NULL;
-  NR_RRC_MAC_CCCH_DATA_IND(message_p).CC_id = 0;
-  NR_RRC_MAC_CCCH_DATA_IND(message_p).nr_cellid = 0;
   itti_send_msg_to_task(TASK_RRC_NRUE, 0, message_p);
 }
 
diff --git a/openair2/RRC/NR_UE/rrc_UE.c b/openair2/RRC/NR_UE/rrc_UE.c
index 28dfebafa8..709ffa50e4 100644
--- a/openair2/RRC/NR_UE/rrc_UE.c
+++ b/openair2/RRC/NR_UE/rrc_UE.c
@@ -1818,7 +1818,7 @@ void *rrc_nrue_task(void *args_p)
          nr_rrc_ue_decode_ccch(&ctxt,
                                NR_RRC_MAC_CCCH_DATA_IND (msg_p).sdu,
                                NR_RRC_MAC_CCCH_DATA_IND (msg_p).sdu_size,
-                               NR_RRC_MAC_CCCH_DATA_IND (msg_p).gnb_index);
+                               /* gNB_index = */ 0);
          break;
 
       /* PDCP messages */