diff --git a/openair2/F1AP/f1ap_cu_interface_management.c b/openair2/F1AP/f1ap_cu_interface_management.c
index 2e73172e2b..075d3c5671 100644
--- a/openair2/F1AP/f1ap_cu_interface_management.c
+++ b/openair2/F1AP/f1ap_cu_interface_management.c
@@ -35,36 +35,14 @@
 #include "f1ap_itti_messaging.h"
 #include "f1ap_cu_interface_management.h"
 
-int CU_send_RESET(sctp_assoc_t assoc_id, const f1ap_reset_t *reset)
-{
-  AssertFatal(1==0,"Not implemented yet\n");
-}
-
 int CU_handle_RESET_ACKNOWLEDGE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu)
 {
-  AssertFatal(1==0,"Not implemented yet\n");
-}
-
-int CU_handle_RESET(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu)
-{
-  AssertFatal(1==0,"Not implemented yet\n");
+  AssertFatal(1 == 0, "Not implemented yet\n");
 }
 
 int CU_send_RESET_ACKNOWLEDGE(sctp_assoc_t assoc_id, const f1ap_reset_ack_t *ack)
 {
-  AssertFatal(1==0,"Not implemented yet\n");
-}
-
-/*
-    Error Indication
-*/
-int CU_handle_ERROR_INDICATION(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu)
-{
-  AssertFatal(1==0,"Not implemented yet\n");
-}
-
-int CU_send_ERROR_INDICATION(sctp_assoc_t assoc_id, F1AP_ErrorIndication_t *ErrorIndication) {
-  AssertFatal(1==0,"Not implemented yet\n");
+  AssertFatal(1 == 0, "Not implemented yet\n");
 }
 
 static uint8_t *cp_octet_string(const OCTET_STRING_t *os, int *len)
@@ -790,12 +768,6 @@ int CU_handle_gNB_DU_CONFIGURATION_UPDATE(instance_t instance, sctp_assoc_t asso
   return 0;
 }
 
-int CU_send_gNB_DU_CONFIGURATION_FAILURE(sctp_assoc_t assoc_id,
-                                         f1ap_gnb_du_configuration_update_failure_t *GNBDUConfigurationUpdateFailure)
-{
-  AssertFatal(1==0,"Not implemented yet\n");
-}
-
 int CU_send_gNB_DU_CONFIGURATION_UPDATE_ACKNOWLEDGE(
     sctp_assoc_t assoc_id,
     f1ap_gnb_du_configuration_update_acknowledge_t *GNBDUConfigurationUpdateAcknowledge)
@@ -931,11 +903,6 @@ int CU_send_gNB_CU_CONFIGURATION_UPDATE(sctp_assoc_t assoc_id, f1ap_gnb_cu_confi
   return 0;
 }
 
-int CU_handle_gNB_CU_CONFIGURATION_UPDATE_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu)
-{
-  AssertFatal(1==0,"Not implemented yet\n");
-}
-
 int CU_handle_gNB_CU_CONFIGURATION_UPDATE_ACKNOWLEDGE(instance_t instance,
                                                       sctp_assoc_t assoc_id,
                                                       uint32_t stream,
@@ -944,16 +911,3 @@ int CU_handle_gNB_CU_CONFIGURATION_UPDATE_ACKNOWLEDGE(instance_t instance,
   LOG_I(F1AP,"Cell Configuration ok (assoc_id %d)\n",assoc_id);
   return(0);
 }
-
-int CU_handle_gNB_DU_RESOURCE_COORDINATION_REQUEST(instance_t instance,
-                                                   sctp_assoc_t assoc_id,
-                                                   uint32_t stream,
-                                                   F1AP_F1AP_PDU_t *pdu)
-{
-  AssertFatal(0, "Not implemented yet\n");
-}
-
-int CU_send_gNB_DU_RESOURCE_COORDINATION_RESPONSE(sctp_assoc_t assoc_id,
-    F1AP_GNBDUResourceCoordinationResponse_t *GNBDUResourceCoordinationResponse) {
-  AssertFatal(0, "Not implemented yet\n");
-}
diff --git a/openair2/F1AP/f1ap_cu_interface_management.h b/openair2/F1AP/f1ap_cu_interface_management.h
index 11a45868e1..9d0bf4a391 100644
--- a/openair2/F1AP/f1ap_cu_interface_management.h
+++ b/openair2/F1AP/f1ap_cu_interface_management.h
@@ -36,17 +36,9 @@
 /*
  * Reset
  */
-int CU_send_RESET(sctp_assoc_t assoc_id, const f1ap_reset_t *reset);
 int CU_handle_RESET_ACKNOWLEDGE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu);
-int CU_handle_RESET(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu);
 int CU_send_RESET_ACKNOWLEDGE(sctp_assoc_t assoc_id, const f1ap_reset_ack_t *ack);
 
-/*
- * Error Indication
- */
-int CU_handle_ERROR_INDICATION(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu);
-int CU_send_ERROR_INDICATION(sctp_assoc_t assoc_id, F1AP_ErrorIndication_t *ErrorIndication);
-
 /*
  * F1 Setup
  */
@@ -61,9 +53,6 @@ int CU_send_F1_SETUP_FAILURE(sctp_assoc_t assoc_id, const f1ap_setup_failure_t *
  */
 int CU_handle_gNB_DU_CONFIGURATION_UPDATE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu);
 
-int CU_send_gNB_DU_CONFIGURATION_FAILURE(sctp_assoc_t assoc_id,
-                                         f1ap_gnb_du_configuration_update_failure_t *GNBDUConfigurationUpdateFailure);
-
 int CU_send_gNB_DU_CONFIGURATION_UPDATE_ACKNOWLEDGE(
     sctp_assoc_t assoc_id,
     f1ap_gnb_du_configuration_update_acknowledge_t *GNBDUConfigurationUpdateAcknowledge);
@@ -72,25 +61,10 @@ int CU_send_gNB_DU_CONFIGURATION_UPDATE_ACKNOWLEDGE(
  * gNB-CU Configuration Update
  */
 int CU_send_gNB_CU_CONFIGURATION_UPDATE(sctp_assoc_t assoc_id, f1ap_gnb_cu_configuration_update_t *f1ap_gnb_cu_configuration_update);
-int CU_handle_gNB_CU_CONFIGURATION_UPDATE_FAILURE(instance_t instance,
-                                                  sctp_assoc_t assoc_id,
-                                                  uint32_t stream,
-                                                  F1AP_F1AP_PDU_t *pdu);
 
 int CU_handle_gNB_CU_CONFIGURATION_UPDATE_ACKNOWLEDGE(instance_t instance,
                                                       sctp_assoc_t assoc_id,
                                                       uint32_t stream,
                                                       F1AP_F1AP_PDU_t *pdu);
 
-/*
- * gNB-DU Resource Coordination
- */
-int CU_handle_gNB_DU_RESOURCE_COORDINATION_REQUEST(instance_t instance,
-                                                   sctp_assoc_t assoc_id,
-                                                   uint32_t stream,
-                                                   F1AP_F1AP_PDU_t *pdu);
-
-int CU_send_gNB_DU_RESOURCE_COORDINATION_RESPONSE(sctp_assoc_t assoc_id,
-    F1AP_GNBDUResourceCoordinationResponse_t *GNBDUResourceCoordinationResponse);
-
 #endif /* F1AP_CU_INTERFACE_MANAGEMENT_H_ */
diff --git a/openair2/F1AP/f1ap_du_interface_management.c b/openair2/F1AP/f1ap_du_interface_management.c
index f560754bf3..673d37b637 100644
--- a/openair2/F1AP/f1ap_du_interface_management.c
+++ b/openair2/F1AP/f1ap_du_interface_management.c
@@ -160,30 +160,6 @@ int DU_send_RESET_ACKNOWLEDGE(sctp_assoc_t assoc_id, const f1ap_reset_ack_t *ack
   return 0;
 }
 
-int DU_send_RESET(sctp_assoc_t assoc_id, const f1ap_reset_t *reset)
-{
-  AssertFatal(1==0,"Not implemented yet\n");
-}
-
-int DU_handle_RESET_ACKNOWLEDGE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu)
-{
-  AssertFatal(1==0,"Not implemented yet\n");
-}
-
-/*
-    Error Indication
-*/
-
-int DU_send_ERROR_INDICATION(sctp_assoc_t assoc_id, F1AP_F1AP_PDU_t *pdu_p)
-{
-  AssertFatal(1==0,"Not implemented yet\n");
-}
-
-int DU_handle_ERROR_INDICATION(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu)
-{
-  AssertFatal(1==0,"Not implemented yet\n");
-}
-
 static F1AP_Served_Cell_Information_t encode_served_cell_info(const f1ap_served_cell_info_t *c)
 {
   /* 4.1.1 served cell Information */
@@ -744,19 +720,6 @@ int DU_send_gNB_DU_CONFIGURATION_UPDATE(sctp_assoc_t assoc_id, const f1ap_gnb_du
   return 0;
 }
 
-int DU_handle_gNB_DU_CONFIGURATION_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu)
-{
-  AssertFatal(1==0,"Not implemented yet\n");
-}
-
-int DU_handle_gNB_DU_CONFIGURATION_UPDATE_ACKNOWLEDGE(instance_t instance,
-                                                      sctp_assoc_t assoc_id,
-                                                      uint32_t stream,
-                                                      F1AP_F1AP_PDU_t *pdu)
-{
-  AssertFatal(1==0,"Not implemented yet\n");
-}
-
 int DU_handle_gNB_CU_CONFIGURATION_UPDATE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu)
 {
   LOG_D(F1AP, "DU_handle_gNB_CU_CONFIGURATION_UPDATE\n");
@@ -956,17 +919,3 @@ int DU_send_gNB_CU_CONFIGURATION_UPDATE_ACKNOWLEDGE(
   f1ap_itti_send_sctp_data_req(assoc_id, buffer, len);
   return 0;
 }
-
-int DU_send_gNB_DU_RESOURCE_COORDINATION_REQUEST(sctp_assoc_t assoc_id,
-                                                 F1AP_GNBDUResourceCoordinationRequest_t *GNBDUResourceCoordinationRequest)
-{
-  AssertFatal(0, "Not implemented yet\n");
-}
-
-int DU_handle_gNB_DU_RESOURCE_COORDINATION_RESPONSE(instance_t instance,
-                                                    sctp_assoc_t assoc_id,
-                                                    uint32_t stream,
-                                                    F1AP_F1AP_PDU_t *pdu)
-{
-  AssertFatal(0, "Not implemented yet\n");
-}
diff --git a/openair2/F1AP/f1ap_du_interface_management.h b/openair2/F1AP/f1ap_du_interface_management.h
index f8d7eafb02..0cbf6adae2 100644
--- a/openair2/F1AP/f1ap_du_interface_management.h
+++ b/openair2/F1AP/f1ap_du_interface_management.h
@@ -38,14 +38,6 @@
  */
 int DU_handle_RESET(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu);
 int DU_send_RESET_ACKNOWLEDGE(sctp_assoc_t assoc_id, const f1ap_reset_ack_t *ack);
-int DU_send_RESET(sctp_assoc_t assoc_id, const f1ap_reset_t *reset);
-int DU_handle_RESET_ACKNOWLEDGE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu);
-
-/*
- * Error Indication
- */
-int DU_send_ERROR_INDICATION(sctp_assoc_t assoc_id, F1AP_F1AP_PDU_t *pdu_p);
-int DU_handle_ERROR_INDICATION(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu);
 
 /*
  * F1 Setup
@@ -61,13 +53,6 @@ int DU_handle_F1_SETUP_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint3
  */
 int DU_send_gNB_DU_CONFIGURATION_UPDATE(sctp_assoc_t assoc_id, const f1ap_gnb_du_configuration_update_t *upd);
 
-int DU_handle_gNB_DU_CONFIGURATION_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu);
-
-int DU_handle_gNB_DU_CONFIGURATION_UPDATE_ACKNOWLEDGE(instance_t instance,
-                                                      sctp_assoc_t assoc_id,
-                                                      uint32_t stream,
-                                                      F1AP_F1AP_PDU_t *pdu);
-
 /*
  * gNB-CU Configuration Update
  */
@@ -79,17 +64,4 @@ int DU_send_gNB_CU_CONFIGURATION_UPDATE_FAILURE(sctp_assoc_t assoc_id,
 int DU_send_gNB_CU_CONFIGURATION_UPDATE_ACKNOWLEDGE(sctp_assoc_t assoc_id,
     f1ap_gnb_cu_configuration_update_acknowledge_t *GNBCUConfigurationUpdateAcknowledge);
 
-
-
-/*
- * gNB-DU Resource Coordination
- */
-int DU_send_gNB_DU_RESOURCE_COORDINATION_REQUEST(sctp_assoc_t assoc_id,
-    F1AP_GNBDUResourceCoordinationRequest_t *GNBDUResourceCoordinationRequest);
-
-int DU_handle_gNB_DU_RESOURCE_COORDINATION_RESPONSE(instance_t instance,
-                                                    sctp_assoc_t assoc_id,
-                                                    uint32_t stream,
-                                                    F1AP_F1AP_PDU_t *pdu);
-
 #endif /* F1AP_DU_INTERFACE_MANAGEMENT_H_ */
diff --git a/openair2/F1AP/f1ap_handlers.c b/openair2/F1AP/f1ap_handlers.c
index bfaa9959dc..544e763c49 100644
--- a/openair2/F1AP/f1ap_handlers.c
+++ b/openair2/F1AP/f1ap_handlers.c
@@ -49,9 +49,7 @@ static const f1ap_message_processing_t f1ap_messages_processing[][3] = {
     {CU_handle_F1_SETUP_REQUEST, DU_handle_F1_SETUP_RESPONSE, DU_handle_F1_SETUP_FAILURE}, /* F1Setup */
     {0, 0, 0}, /* ErrorIndication */
     {CU_handle_gNB_DU_CONFIGURATION_UPDATE, 0, 0}, /* gNBDUConfigurationUpdate */
-    {DU_handle_gNB_CU_CONFIGURATION_UPDATE,
-     CU_handle_gNB_CU_CONFIGURATION_UPDATE_ACKNOWLEDGE,
-     CU_handle_gNB_CU_CONFIGURATION_UPDATE_FAILURE}, /* gNBCUConfigurationUpdate */
+    {DU_handle_gNB_CU_CONFIGURATION_UPDATE, CU_handle_gNB_CU_CONFIGURATION_UPDATE_ACKNOWLEDGE, 0}, /* gNBCUConfigurationUpdate */
     {DU_handle_UE_CONTEXT_SETUP_REQUEST, CU_handle_UE_CONTEXT_SETUP_RESPONSE, 0}, /* UEContextSetup */
     {DU_handle_UE_CONTEXT_RELEASE_COMMAND, CU_handle_UE_CONTEXT_RELEASE_COMPLETE, 0}, /* UEContextRelease */
     {DU_handle_UE_CONTEXT_MODIFICATION_REQUEST, CU_handle_UE_CONTEXT_MODIFICATION_RESPONSE, 0}, /* UEContextModification */