diff --git a/openair2/F1AP/f1ap_common.c b/openair2/F1AP/f1ap_common.c
index f00b159e12c02649510c6ab31e6c9ce0f671f8dc..0d6de4414b1393bcccfcb05f752110449dab6a3b 100644
--- a/openair2/F1AP/f1ap_common.c
+++ b/openair2/F1AP/f1ap_common.c
@@ -53,153 +53,6 @@ inline void ASN_DEBUG(const char *fmt, ...)
 }
 #endif
 
-/*
-ssize_t f1ap_generate_initiating_message(
-  uint8_t               **buffer,
-  uint32_t               *length,
-  e_F1ap_ProcedureCode    procedureCode,
-  F1ap_Criticality_t      criticality,
-  asn_TYPE_descriptor_t  *td,
-  void                   *sptr)
-{
-  S1AP_PDU_t pdu;
-  ssize_t    encoded;
-
-  memset(&pdu, 0, sizeof(S1AP_PDU_t));
-
-  pdu.present = S1AP_PDU_PR_initiatingMessage;
-  pdu.choice.initiatingMessage.procedureCode = procedureCode;
-  pdu.choice.initiatingMessage.criticality   = criticality;
-  ANY_fromType_aper(&pdu.choice.initiatingMessage.value, td, sptr);
-
-  if (asn1_xer_print) {
-    xer_fprint(stdout, &asn_DEF_S1AP_PDU, (void *)&pdu);
-  }*/
-
-  /* We can safely free list of IE from sptr */
-/*
-  ASN_STRUCT_FREE_CONTENTS_ONLY(*td, sptr);
-
-  if ((encoded = aper_encode_to_new_buffer(&asn_DEF_S1AP_PDU, 0, &pdu,
-                 (void **)buffer)) < 0) {
-    return -1;
-  }
-
-  *length = encoded;
-  return encoded;
-}
-
-ssize_t f1ap_generate_successfull_outcome(
-  uint8_t               **buffer,
-  uint32_t               *length,
-  e_F1ap_ProcedureCode         procedureCode,
-  F1ap_Criticality_t           criticality,
-  asn_TYPE_descriptor_t  *td,
-  void                   *sptr)
-{
-  S1AP_PDU_t pdu;
-  ssize_t    encoded;
-
-  memset(&pdu, 0, sizeof(S1AP_PDU_t));
-
-  pdu.present = S1AP_PDU_PR_successfulOutcome;
-  pdu.choice.successfulOutcome.procedureCode = procedureCode;
-  pdu.choice.successfulOutcome.criticality   = criticality;
-  ANY_fromType_aper(&pdu.choice.successfulOutcome.value, td, sptr);
-
-  if (asn1_xer_print) {
-    xer_fprint(stdout, &asn_DEF_S1AP_PDU, (void *)&pdu);
-  }*/
-
-  /* We can safely free list of IE from sptr */
-/*
-  ASN_STRUCT_FREE_CONTENTS_ONLY(*td, sptr);
-
-  if ((encoded = aper_encode_to_new_buffer(&asn_DEF_S1AP_PDU, 0, &pdu,
-                 (void **)buffer)) < 0) {
-    return -1;
-  }
-
-  *length = encoded;
-
-  return encoded;
-}
-
-ssize_t f1ap_generate_unsuccessfull_outcome(
-  uint8_t               **buffer,
-  uint32_t               *length,
-  e_F1ap_ProcedureCode         procedureCode,
-  F1ap_Criticality_t           criticality,
-  asn_TYPE_descriptor_t  *td,
-  void                   *sptr)
-{
-  S1AP_PDU_t pdu;
-  ssize_t    encoded;
-
-  memset(&pdu, 0, sizeof(S1AP_PDU_t));
-
-  pdu.present = S1AP_PDU_PR_unsuccessfulOutcome;
-  pdu.choice.successfulOutcome.procedureCode = procedureCode;
-  pdu.choice.successfulOutcome.criticality   = criticality;
-  ANY_fromType_aper(&pdu.choice.successfulOutcome.value, td, sptr);
-
-  if (asn1_xer_print) {
-    xer_fprint(stdout, &asn_DEF_S1AP_PDU, (void *)&pdu);
-  }
-*/
-  /* We can safely free list of IE from sptr */
-/*
-  ASN_STRUCT_FREE_CONTENTS_ONLY(*td, sptr);
-
-  if ((encoded = aper_encode_to_new_buffer(&asn_DEF_S1AP_PDU, 0, &pdu,
-                 (void **)buffer)) < 0) {
-    return -1;
-  }
-
-  *length = encoded;
-
-  return encoded;
-}
-
-F1ap_IE_t *f1ap_new_ie(
-  F1ap_ProtocolIE_ID_t   id,
-  F1ap_Criticality_t     criticality,
-  asn_TYPE_descriptor_t *type,
-  void                  *sptr)
-{
-  F1ap_IE_t *buff;
-
-  if ((buff = malloc(sizeof(F1ap_IE_t))) == NULL) {
-    // Possible error on malloc
-    return NULL;
-  }
-
-  memset((void *)buff, 0, sizeof(F1ap_IE_t));
-
-  buff->id = id;
-  buff->criticality = criticality;
-
-  if (ANY_fromType_aper(&buff->value, type, sptr) < 0) {
-    fprintf(stderr, "Encoding of %s failed\n", type->name);
-    free(buff);
-    return NULL;
-  }
-
-  if (asn1_xer_print)
-    if (xer_fprint(stdout, &asn_DEF_F1ap_IE, buff) < 0) {
-      free(buff);
-      return NULL;
-    }
-
-  return buff;
-}
-
-void f1ap_handle_criticality(F1ap_Criticality_t criticality)
-{
-
-}
-*/
-
 uint8_t F1AP_get_next_transaction_identifier(module_id_t enb_mod_idP, module_id_t cu_mod_idP)
 {
   static uint8_t transaction_identifier[NUMBER_OF_eNB_MAX];