diff --git a/openair2/COMMON/e1ap_messages_types.h b/openair2/COMMON/e1ap_messages_types.h
index fba56ccb14..993a93bb38 100644
--- a/openair2/COMMON/e1ap_messages_types.h
+++ b/openair2/COMMON/e1ap_messages_types.h
@@ -66,7 +66,6 @@ typedef struct e1ap_setup_req_s {
   uint16_t              default_sctp_stream_id;
   net_ip_address_t CUUP_e1_ip_address;
   net_ip_address_t CUCP_e1_ip_address;
-  long                  cn_support;
   uint16_t remotePortF1U;
   char* localAddressF1U;
   uint16_t localPortF1U;
@@ -165,8 +164,6 @@ typedef struct e1ap_bearer_setup_req_s {
   long     ueDlAggMaxBitRate;
   PLMN_ID_t servingPLMNid;
   long activityNotificationLevel;
-  int numDRBs;
-  drb_to_setup_t DRBList[E1AP_MAX_NUM_DRBS];
   int numPDUSessions;
   pdu_session_to_setup_t pduSession[E1AP_MAX_NUM_PDU_SESSIONS];
   int numPDUSessionsMod;
@@ -180,14 +177,6 @@ typedef struct e1ap_bearer_release_cmd_s {
   long cause;
 } e1ap_bearer_release_cmd_t;
 
-typedef struct drb_setup_s {
-  int drbId;
-  in_addr_t tlAddress;
-  int teId;
-  int numUpParam;
-  up_params_t UpParamList[E1AP_MAX_NUM_UP_PARAM];
-} drb_setup_t;
-
 typedef struct qos_flow_setup_s {
   long id;
 } qos_flow_setup_t;
@@ -219,8 +208,6 @@ typedef struct pdu_session_setup_s {
 typedef struct e1ap_bearer_setup_resp_s {
   uint32_t gNB_cu_cp_ue_id;
   uint32_t gNB_cu_up_ue_id;
-  int numDRBs;
-  drb_setup_t DRBList[E1AP_MAX_NUM_DRBS];
   int numPDUSessions;
   pdu_session_setup_t pduSession[E1AP_MAX_NUM_PDU_SESSIONS];
 } e1ap_bearer_setup_resp_t;
diff --git a/openair2/E1AP/e1ap.c b/openair2/E1AP/e1ap.c
index 2390b23d2e..6eebf8f7a9 100644
--- a/openair2/E1AP/e1ap.c
+++ b/openair2/E1AP/e1ap.c
@@ -191,7 +191,7 @@ static void fill_SETUP_REQUEST(e1ap_setup_req_t *setup, E1AP_E1AP_PDU_t *pdu)
   ieC4->id = E1AP_ProtocolIE_ID_id_CNSupport;
   ieC4->criticality = E1AP_Criticality_reject;
   ieC4->value.present = E1AP_GNB_CU_UP_E1SetupRequestIEs__value_PR_CNSupport;
-  ieC4->value.choice.CNSupport = setup->cn_support;
+  ieC4->value.choice.CNSupport = E1AP_CNSupport_c_5gc; /* only 5GC supported */
 
   /* mandatory */
   /* c5. Supported PLMNs */
@@ -293,8 +293,7 @@ void extract_SETUP_REQUEST(const E1AP_E1AP_PDU_t *pdu,
   /* CN Support */
   F1AP_FIND_PROTOCOLIE_BY_ID(E1AP_GNB_CU_UP_E1SetupRequestIEs_t, ie, in,
                              E1AP_ProtocolIE_ID_id_CNSupport, true);
-  req->cn_support = ie->value.choice.CNSupport;
-  LOG_D(E1AP, "E1ap CN support: %ld\n", req->cn_support);
+  AssertFatal(ie->value.choice.CNSupport == E1AP_CNSupport_c_5gc, "only 5GC CN Support supported\n");
 
   /* Supported PLMNs */
   F1AP_FIND_PROTOCOLIE_BY_ID(E1AP_GNB_CU_UP_E1SetupRequestIEs_t, ie, in,
@@ -676,7 +675,7 @@ static void fill_BEARER_CONTEXT_SETUP_RESPONSE(e1ap_bearer_setup_resp_t *const r
   ieC3->id            = E1AP_ProtocolIE_ID_id_System_BearerContextSetupResponse;
   ieC3->criticality   = E1AP_Criticality_reject;
   ieC3->value.present = E1AP_BearerContextSetupResponseIEs__value_PR_System_BearerContextSetupResponse;
-  if (0) { // EUTRAN
+  /*if (0) { // EUTRAN
     ieC3->value.choice.System_BearerContextSetupResponse.present = E1AP_System_BearerContextSetupResponse_PR_e_UTRAN_BearerContextSetupResponse;
     E1AP_ProtocolIE_Container_4932P21_t *msgEUTRAN_list = calloc(1, sizeof(E1AP_ProtocolIE_Container_4932P21_t));
     ieC3->value.choice.System_BearerContextSetupResponse.choice.e_UTRAN_BearerContextSetupResponse = (struct E1AP_ProtocolIE_Container *) msgEUTRAN_list;
@@ -703,7 +702,7 @@ static void fill_BEARER_CONTEXT_SETUP_RESPONSE(e1ap_bearer_setup_resp_t *const r
         INT32_TO_OCTET_STRING(j->teId, &gTPTunnel->gTP_TEID);
       }
     }
-  } else {
+  } else */{
     ieC3->value.choice.System_BearerContextSetupResponse.present = E1AP_System_BearerContextSetupResponse_PR_nG_RAN_BearerContextSetupResponse;
     E1AP_ProtocolIE_Container_4932P22_t *msgNGRAN_list = calloc(1, sizeof(E1AP_ProtocolIE_Container_4932P22_t));
     ieC3->value.choice.System_BearerContextSetupResponse.choice.nG_RAN_BearerContextSetupResponse = (struct E1AP_ProtocolIE_Container *) msgNGRAN_list;
diff --git a/openair2/E1AP/e1ap_setup.c b/openair2/E1AP/e1ap_setup.c
index da643636fc..324f5b87e2 100644
--- a/openair2/E1AP/e1ap_setup.c
+++ b/openair2/E1AP/e1ap_setup.c
@@ -122,7 +122,6 @@ MessageDef *RCconfig_NR_CU_E1(bool separate_CUUP_process)
       e1Setup->CUCP_e1_ip_address.ipv4 = 1;
       strcpy(e1Setup->CUUP_e1_ip_address.ipv4_address, *(e1Parms[GNB_CONFIG_E1_IPV4_ADDRESS_CUUP].strptr));
       e1Setup->CUUP_e1_ip_address.ipv4 = 1;
-      e1Setup->cn_support = *e1Parms[GNB_CONFIG_E1_CN_SUPPORT].uptr;
     }
   }
   return msgConfig;
diff --git a/openair2/GNB_APP/gnb_paramdef.h b/openair2/GNB_APP/gnb_paramdef.h
index d78e438217..4ce9da2124 100644
--- a/openair2/GNB_APP/gnb_paramdef.h
+++ b/openair2/GNB_APP/gnb_paramdef.h
@@ -376,19 +376,16 @@ typedef enum {
 #define GNB_CONFIG_E1_CU_TYPE_IDX                         0
 #define GNB_CONFIG_E1_IPV4_ADDRESS_CUCP                   1
 #define GNB_CONFIG_E1_IPV4_ADDRESS_CUUP 2
-#define GNB_CONFIG_E1_CN_SUPPORT 3
 
 #define GNB_CONFIG_STRING_E1_CU_TYPE                      "type"
 #define GNB_CONFIG_STRING_E1_IPV4_ADDRESS_CUCP "ipv4_cucp"
 #define GNB_CONFIG_STRING_E1_IPV4_ADDRESS_CUUP "ipv4_cuup"
-#define GNB_CONFIG_STRING_E1_CN_SUPPORT                   "cn_support"
 
 // clang-format off
 #define GNBE1PARAMS_DESC { \
   {GNB_CONFIG_STRING_E1_CU_TYPE,           NULL, 0, .strptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \
   {GNB_CONFIG_STRING_E1_IPV4_ADDRESS_CUCP, NULL, 0, .strptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \
   {GNB_CONFIG_STRING_E1_IPV4_ADDRESS_CUUP, NULL, 0, .strptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \
-  {GNB_CONFIG_STRING_E1_CN_SUPPORT,        NULL, 0, .uptr  =NULL, .defintval=1L,   TYPE_UINT,   0} \
   }
 // clang-format on
 /* L1 configuration section names   */