diff --git a/openair3/NGAP/ngap_gNB_nas_procedures.c b/openair3/NGAP/ngap_gNB_nas_procedures.c
index d49f6951ac..6d03c23e76 100644
--- a/openair3/NGAP/ngap_gNB_nas_procedures.c
+++ b/openair3/NGAP/ngap_gNB_nas_procedures.c
@@ -76,7 +76,8 @@ int ngap_gNB_handle_nas_first_req(
     out = &pdu.choice.initiatingMessage->value.choice.InitialUEMessage;
 
     /* Select the AMF corresponding to the provided GUAMI. */
-    if (ngap_nas_first_req_p->ue_identity.presenceMask & NGAP_UE_IDENTITIES_guami) {
+    //TODO
+    /*if (ngap_nas_first_req_p->ue_identity.presenceMask & NGAP_UE_IDENTITIES_guami) {
         amf_desc_p = ngap_gNB_nnsf_select_amf_by_guami(
                          instance_p,
                          ngap_nas_first_req_p->establishment_cause,
@@ -93,11 +94,12 @@ int ngap_gNB_handle_nas_first_req(
                       ngap_nas_first_req_p->ue_identity.guami.amf_set_id,
                       ngap_nas_first_req_p->ue_identity.guami.amf_pointer);
         }
-    }
+    }*/
 
     if (amf_desc_p == NULL) {
         /* Select the AMF corresponding to the provided s-TMSI. */
-        if (ngap_nas_first_req_p->ue_identity.presenceMask & NGAP_UE_IDENTITIES_FiveG_s_tmsi) {
+        //TODO
+        /*if (ngap_nas_first_req_p->ue_identity.presenceMask & NGAP_UE_IDENTITIES_FiveG_s_tmsi) {
             amf_desc_p = ngap_gNB_nnsf_select_amf_by_amf_setid(
                              instance_p,
                              ngap_nas_first_req_p->establishment_cause,
@@ -114,13 +116,14 @@ int ngap_gNB_handle_nas_first_req(
                           instance_p->mcc[ngap_nas_first_req_p->selected_plmn_identity],
                           instance_p->mnc[ngap_nas_first_req_p->selected_plmn_identity]);
             }
-        }
+        }*/
     }
 
     if (amf_desc_p == NULL) {
         /* Select AMF based on the selected PLMN identity, received through RRC
          * Connection Setup Complete */
-        amf_desc_p = ngap_gNB_nnsf_select_amf_by_plmn_id(
+        //TODO
+        /*amf_desc_p = ngap_gNB_nnsf_select_amf_by_plmn_id(
                          instance_p,
                          ngap_nas_first_req_p->establishment_cause,
                          ngap_nas_first_req_p->selected_plmn_identity);
@@ -133,7 +136,7 @@ int ngap_gNB_handle_nas_first_req(
                       ngap_nas_first_req_p->selected_plmn_identity,
                       instance_p->mcc[ngap_nas_first_req_p->selected_plmn_identity],
                       instance_p->mnc[ngap_nas_first_req_p->selected_plmn_identity]);
-        }
+        }*/
     }
 
     if (amf_desc_p == NULL) {
@@ -141,7 +144,8 @@ int ngap_gNB_handle_nas_first_req(
          * If no AMF corresponds to the GUAMI, the s-TMSI, or the selected PLMN
          * identity, selects the AMF with the highest capacity.
          */
-        amf_desc_p = ngap_gNB_nnsf_select_amf(
+        //TODO
+        /*amf_desc_p = ngap_gNB_nnsf_select_amf(
                          instance_p,
                          ngap_nas_first_req_p->establishment_cause);
 
@@ -150,7 +154,7 @@ int ngap_gNB_handle_nas_first_req(
                       instance,
                       amf_desc_p->amf_name,
                       amf_desc_p->assoc_id);
-        }
+        }*/
     }
 
     if (amf_desc_p == NULL) {