diff --git a/openair2/F1AP/f1ap_cu_interface_management.c b/openair2/F1AP/f1ap_cu_interface_management.c
index 03b281ea39f8a27d56f14b113650e9e1b8a144dc..6863dfbd2df2e8d8694537a01447c4d2b96f1a74 100644
--- a/openair2/F1AP/f1ap_cu_interface_management.c
+++ b/openair2/F1AP/f1ap_cu_interface_management.c
@@ -194,42 +194,7 @@ int CU_handle_F1_SETUP_REQUEST(instance_t instance, sctp_assoc_t assoc_id, uint3
     memcpy(sys_info->sib1, DUsi->sIB1_message.buf, DUsi->sIB1_message.size);
     sys_info->sib1_length = DUsi->sIB1_message.size;
   }
-  
-  // char *measurement_timing_information[F1AP_MAX_NB_CELLS];
-  // uint8_t ranac[F1AP_MAX_NB_CELLS];
-  // int fdd_flag = f1ap_setup_req->fdd_flag;
-  // union {
-  //   struct {
-  //     uint32_t ul_nr_arfcn;
-  //     uint8_t ul_scs;
-  //     uint8_t ul_nrb;
-  //     uint32_t dl_nr_arfcn;
-  //     uint8_t dl_scs;
-  //     uint8_t dl_nrb;
-  //     uint32_t sul_active;
-  //     uint32_t sul_nr_arfcn;
-  //     uint8_t sul_scs;
-  //     uint8_t sul_nrb;
-  //     uint8_t num_frequency_bands;
-  //     uint16_t nr_band[32];
-  //     uint8_t num_sul_frequency_bands;
-  //     uint16_t nr_sul_band[32];
-  //   } fdd;
-  //   struct {
-  //     uint32_t nr_arfcn;
-  //     uint8_t scs;
-  //     uint8_t nrb;
-  //     uint32_t sul_active;
-  //     uint32_t sul_nr_arfcn;
-  //     uint8_t sul_scs;
-  //     uint8_t sul_nrb;
-  //     uint8_t num_frequency_bands;
-  //     uint16_t nr_band[32];
-  //     uint8_t num_sul_frequency_bands;
-  //     uint16_t nr_sul_band[32];
-  //   } tdd;
-  // } nr_mode_info[F1AP_MAX_NB_CELLS];
-  
+
   if (req->num_cells_available > 0) {
       itti_send_msg_to_task(TASK_RRC_GNB, GNB_MODULE_ID_TO_INSTANCE(instance), message_p);
   } else {
diff --git a/openair2/F1AP/f1ap_cu_task.c b/openair2/F1AP/f1ap_cu_task.c
index 3d1f0b6aac1b08a46540fb1150d5e19b19e61d56..545091f213db61d25df4c81c35fb8263265ec8b0 100644
--- a/openair2/F1AP/f1ap_cu_task.c
+++ b/openair2/F1AP/f1ap_cu_task.c
@@ -208,14 +208,6 @@ void *F1AP_CU_task(void *arg) {
                                                &F1AP_UE_CONTEXT_MODIFICATION_REFUSE(received_msg));
         break;
 
-      //    case F1AP_SETUP_RESPONSE: // This is from RRC
-      //    CU_send_F1_SETUP_RESPONSE(instance, *f1ap_setup_ind, &(F1AP_SETUP_RESP) f1ap_setup_resp)
-      //        break;
-
-      //    case F1AP_SETUP_FAILURE: // This is from RRC
-      //    CU_send_F1_SETUP_FAILURE(instance, *f1ap_setup_ind, &(F1AP_SETUP_FAILURE) f1ap_setup_failure)
-      //       break;
-
       case TERMINATE_MESSAGE:
         LOG_W(F1AP, " *** Exiting F1AP thread\n");
         itti_exit_task();