diff --git a/openair2/F1AP/f1ap_cu_interface_management.c b/openair2/F1AP/f1ap_cu_interface_management.c
index b3668cd783..d65a58e27d 100644
--- a/openair2/F1AP/f1ap_cu_interface_management.c
+++ b/openair2/F1AP/f1ap_cu_interface_management.c
@@ -212,7 +212,7 @@ int CU_handle_F1_SETUP_REQUEST(instance_t instance,
   message_p = itti_alloc_new_message(TASK_CU_F1, 0, F1AP_SETUP_REQ);
   memcpy(&F1AP_SETUP_REQ(message_p), req, sizeof(f1ap_setup_req_t) );
   if (num_cells_available > 0) {
-    if (RC.nrrrc && RC.nrrrc[0]->node_type == ngran_gNB_CU) {
+    if (f1ap_req(true, instance)->cell_type == CELL_MACRO_GNB) {
       itti_send_msg_to_task(TASK_RRC_GNB, GNB_MODULE_ID_TO_INSTANCE(instance), message_p);
     } else {
       itti_send_msg_to_task(TASK_RRC_ENB, ENB_MODULE_ID_TO_INSTANCE(instance), message_p);
diff --git a/openair2/F1AP/f1ap_cu_task.c b/openair2/F1AP/f1ap_cu_task.c
index 4e6fc7d712..9ffa3ab800 100644
--- a/openair2/F1AP/f1ap_cu_task.c
+++ b/openair2/F1AP/f1ap_cu_task.c
@@ -61,16 +61,6 @@ void cu_task_handle_sctp_association_resp(instance_t instance, sctp_new_associat
     //f1ap_handle_setup_message(instance, sctp_new_association_resp->sctp_state == SCTP_STATE_SHUTDOWN);
     return; // exit -1 for debugging
   }
-
-  /* setup parameters for F1U and start the server */
-  const cudu_params_t params = {
-    .local_ipv4_address  = RC.nrrrc[instance]->eth_params_s.my_addr,
-    .local_port          = RC.nrrrc[instance]->eth_params_s.my_portd,
-    .remote_ipv4_address = RC.nrrrc[instance]->eth_params_s.remote_addr,
-    .remote_port         = RC.nrrrc[instance]->eth_params_s.remote_portd
-  };
-  //AssertFatal(proto_agent_start(instance, &params) == 0,
-  //          "could not start PROTO_AGENT for F1U on instance %ld!\n", instance);
 }
 
 void cu_task_handle_sctp_data_ind(instance_t instance, sctp_data_ind_t *sctp_data_ind) {