From 71ed56dbd7d16bdf9f7fe9f52c01e0540084d0ce Mon Sep 17 00:00:00 2001
From: newb1er <taiwanmichael429@gmail.com>
Date: Thu, 11 Jul 2024 11:49:37 +0800
Subject: [PATCH 1/4] fix: remove R16 related models

---
 models/model_access_token_req.go              | 34 -------
 models/model_access_token_req_1.go            | 34 -------
 models/model_access_token_rsp.go              | 22 -----
 models/model_af_event.go                      | 33 -------
 models/model_af_event_notification.go         | 19 ----
 models/model_af_location_area.go              | 28 ------
 models/model_af_location_area5_g.go           | 21 -----
 models/model_am_policy_association.go         | 26 ------
 ...del_am_policy_association_release_cause.go | 22 -----
 models/model_am_policy_association_request.go | 49 ----------
 ...el_am_policy_association_update_request.go | 43 ---------
 ...odel_am_policy_termination_notification.go | 18 ----
 models/model_am_policy_update.go              | 26 ------
 models/model_amf_info.go                      | 25 -----
 models/model_association_type.go              | 21 -----
 models/model_auth_result.go                   | 22 -----
 models/model_auth_type.go                     | 22 -----
 models/model_bdt_policy_bdt_policy_data.go    | 24 -----
 .../model_bdt_policy_bdt_policy_data_patch.go | 19 ----
 models/model_bdt_policy_bdt_req_data_patch.go | 19 ----
 models/model_bdt_policy_patch_bdt_policy.go   | 19 ----
 models/model_bsf_info.go                      | 21 -----
 models/model_cause.go                         | 46 ---------
 models/model_dr_bdt_data.go                   | 30 ------
 models/model_dr_bdt_policy_data.go            | 23 -----
 models/model_dr_bdt_policy_data_patch.go      | 18 ----
 models/model_dr_data_set_name.go              | 29 ------
 models/model_ec_restriction_data_wb.go        | 18 ----
 models/model_event_subscription.go            | 21 -----
 models/model_event_type.go                    | 31 -------
 models/model_events_notification.go           | 46 ---------
 models/model_events_subsc_req_data.go         | 24 -----
 models/model_events_subsc_req_data_rm.go      | 24 -----
 models/model_ext_problem_details.go           | 28 ------
 models/model_extended_problem_details.go      | 29 ------
 models/model_failure_cause.go                 | 24 -----
 models/model_failure_code.go                  | 40 --------
 models/model_gbr_qos_flow_information.go      | 24 -----
 models/model_invalid_param_1.go               | 20 ----
 models/model_ip_address.go                    | 19 ----
 models/model_ipv4_address_range.go            | 19 ----
 models/model_ipv6_prefix_range.go             | 19 ----
 models/model_location_accuracy.go             | 24 -----
 models/model_location_area.go                 | 21 -----
 .../model_location_reporting_configuration.go | 20 ----
 models/model_monitoring_configuration.go      | 29 ------
 .../model_nf_management_subscription_data.go  | 40 --------
 models/model_nf_profile.go                    | 90 ------------------
 models/model_nf_profile_notification_data.go  | 89 ------------------
 models/model_nf_service.go                    | 53 -----------
 models/model_nf_status.go                     | 22 -----
 models/model_nf_type.go                       | 55 -----------
 models/model_ngap_ie_type.go                  | 36 -------
 models/model_nidd_information.go              | 19 ----
 models/model_notification.go                  | 23 -----
 models/model_notification_data.go             | 22 -----
 models/model_notification_method.go           | 22 -----
 models/model_notification_type.go             | 27 ------
 models/model_null_response_200.go             | 23 -----
 models/model_pdu_session_status_cfg.go        | 17 ----
 models/model_pfd.go                           | 25 -----
 models/model_pfd_data.go                      | 19 ----
 models/model_pfd_management.go                | 28 ------
 models/model_pfd_pfd_data.go                  | 26 ------
 models/model_pfd_report.go                    | 22 -----
 ...licy_auth_qos_notification_control_info.go | 20 ----
 models/model_post_sm_contexts_error.go        | 19 ----
 models/model_pp_data_type.go                  | 27 ------
 models/model_problem_details_1.go             | 30 ------
 .../model_qos_flow_add_modify_request_item.go | 22 -----
 models/model_qos_flow_profile.go              | 25 -----
 models/model_redirect_address_type.go         | 23 -----
 models/model_reporting_options.go             | 26 ------
 models/model_roaming_charging_profile.go      | 18 ----
 models/model_shared_data.go                   | 24 -----
 models/model_sm_context_create_data.go        | 93 -------------------
 models/model_sm_context_created_data.go       | 35 -------
 models/model_sm_context_release_data.go       | 26 ------
 .../model_sm_context_status_notification.go   | 27 ------
 models/model_sm_context_update_data.go        | 66 -------------
 ...sm_policy_qos_notification_control_info.go | 22 -----
 ...odel_sm_policy_termination_notification.go | 18 ----
 models/model_sor_info.go                      | 25 -----
 models/model_steering_container.go            | 16 ----
 models/model_steering_info.go                 | 18 ----
 models/model_subscription_data_sets.go        | 29 ------
 models/model_termination_cause.go             | 22 -----
 models/model_traffic_descriptor.go            | 19 ----
 models/model_traffic_influ_sub_patch.go       | 30 ------
 models/model_transfer_policy.go               | 24 -----
 models/model_trigger.go                       | 28 ------
 models/model_trigger_type.go                  | 59 ------------
 models/model_ue_id.go                         | 18 ----
 models/model_ue_policy_association.go         | 23 -----
 ...del_ue_policy_association_release_cause.go | 22 -----
 models/model_ue_policy_association_request.go | 39 --------
 ...el_ue_policy_association_update_request.go | 36 -------
 models/model_ue_policy_request_trigger.go     | 25 -----
 ...odel_ue_policy_termination_notification.go | 18 ----
 models/model_ue_policy_update.go              | 23 -----
 models/model_update_sm_context_error.go       | 19 ----
 models/model_upu_data_1.go                    | 19 ----
 models/model_upu_info.go                      | 26 ------
 models/model_user_plane_location_area.go      | 20 ----
 models/pfd_failure_code.go                    | 25 -----
 105 files changed, 2955 deletions(-)
 delete mode 100644 models/model_access_token_req.go
 delete mode 100644 models/model_access_token_req_1.go
 delete mode 100644 models/model_access_token_rsp.go
 delete mode 100644 models/model_af_event.go
 delete mode 100644 models/model_af_event_notification.go
 delete mode 100644 models/model_af_location_area.go
 delete mode 100644 models/model_af_location_area5_g.go
 delete mode 100644 models/model_am_policy_association.go
 delete mode 100644 models/model_am_policy_association_release_cause.go
 delete mode 100644 models/model_am_policy_association_request.go
 delete mode 100644 models/model_am_policy_association_update_request.go
 delete mode 100644 models/model_am_policy_termination_notification.go
 delete mode 100644 models/model_am_policy_update.go
 delete mode 100644 models/model_amf_info.go
 delete mode 100644 models/model_association_type.go
 delete mode 100644 models/model_auth_result.go
 delete mode 100644 models/model_auth_type.go
 delete mode 100644 models/model_bdt_policy_bdt_policy_data.go
 delete mode 100644 models/model_bdt_policy_bdt_policy_data_patch.go
 delete mode 100644 models/model_bdt_policy_bdt_req_data_patch.go
 delete mode 100644 models/model_bdt_policy_patch_bdt_policy.go
 delete mode 100644 models/model_bsf_info.go
 delete mode 100644 models/model_cause.go
 delete mode 100644 models/model_dr_bdt_data.go
 delete mode 100644 models/model_dr_bdt_policy_data.go
 delete mode 100644 models/model_dr_bdt_policy_data_patch.go
 delete mode 100644 models/model_dr_data_set_name.go
 delete mode 100644 models/model_ec_restriction_data_wb.go
 delete mode 100644 models/model_event_subscription.go
 delete mode 100644 models/model_event_type.go
 delete mode 100644 models/model_events_notification.go
 delete mode 100644 models/model_events_subsc_req_data.go
 delete mode 100644 models/model_events_subsc_req_data_rm.go
 delete mode 100644 models/model_ext_problem_details.go
 delete mode 100644 models/model_extended_problem_details.go
 delete mode 100644 models/model_failure_cause.go
 delete mode 100644 models/model_failure_code.go
 delete mode 100644 models/model_gbr_qos_flow_information.go
 delete mode 100644 models/model_invalid_param_1.go
 delete mode 100644 models/model_ip_address.go
 delete mode 100644 models/model_ipv4_address_range.go
 delete mode 100644 models/model_ipv6_prefix_range.go
 delete mode 100644 models/model_location_accuracy.go
 delete mode 100644 models/model_location_area.go
 delete mode 100644 models/model_location_reporting_configuration.go
 delete mode 100644 models/model_monitoring_configuration.go
 delete mode 100644 models/model_nf_management_subscription_data.go
 delete mode 100644 models/model_nf_profile.go
 delete mode 100644 models/model_nf_profile_notification_data.go
 delete mode 100644 models/model_nf_service.go
 delete mode 100644 models/model_nf_status.go
 delete mode 100644 models/model_nf_type.go
 delete mode 100644 models/model_ngap_ie_type.go
 delete mode 100644 models/model_nidd_information.go
 delete mode 100644 models/model_notification.go
 delete mode 100644 models/model_notification_data.go
 delete mode 100644 models/model_notification_method.go
 delete mode 100644 models/model_notification_type.go
 delete mode 100644 models/model_null_response_200.go
 delete mode 100644 models/model_pdu_session_status_cfg.go
 delete mode 100644 models/model_pfd.go
 delete mode 100644 models/model_pfd_data.go
 delete mode 100644 models/model_pfd_management.go
 delete mode 100644 models/model_pfd_pfd_data.go
 delete mode 100644 models/model_pfd_report.go
 delete mode 100644 models/model_policy_auth_qos_notification_control_info.go
 delete mode 100644 models/model_post_sm_contexts_error.go
 delete mode 100644 models/model_pp_data_type.go
 delete mode 100644 models/model_problem_details_1.go
 delete mode 100644 models/model_qos_flow_add_modify_request_item.go
 delete mode 100644 models/model_qos_flow_profile.go
 delete mode 100644 models/model_redirect_address_type.go
 delete mode 100644 models/model_reporting_options.go
 delete mode 100644 models/model_roaming_charging_profile.go
 delete mode 100644 models/model_shared_data.go
 delete mode 100644 models/model_sm_context_create_data.go
 delete mode 100644 models/model_sm_context_created_data.go
 delete mode 100644 models/model_sm_context_release_data.go
 delete mode 100644 models/model_sm_context_status_notification.go
 delete mode 100644 models/model_sm_context_update_data.go
 delete mode 100644 models/model_sm_policy_qos_notification_control_info.go
 delete mode 100644 models/model_sm_policy_termination_notification.go
 delete mode 100644 models/model_sor_info.go
 delete mode 100644 models/model_steering_container.go
 delete mode 100644 models/model_steering_info.go
 delete mode 100644 models/model_subscription_data_sets.go
 delete mode 100644 models/model_termination_cause.go
 delete mode 100644 models/model_traffic_descriptor.go
 delete mode 100644 models/model_traffic_influ_sub_patch.go
 delete mode 100644 models/model_transfer_policy.go
 delete mode 100644 models/model_trigger.go
 delete mode 100644 models/model_trigger_type.go
 delete mode 100644 models/model_ue_id.go
 delete mode 100644 models/model_ue_policy_association.go
 delete mode 100644 models/model_ue_policy_association_release_cause.go
 delete mode 100644 models/model_ue_policy_association_request.go
 delete mode 100644 models/model_ue_policy_association_update_request.go
 delete mode 100644 models/model_ue_policy_request_trigger.go
 delete mode 100644 models/model_ue_policy_termination_notification.go
 delete mode 100644 models/model_ue_policy_update.go
 delete mode 100644 models/model_update_sm_context_error.go
 delete mode 100644 models/model_upu_data_1.go
 delete mode 100644 models/model_upu_info.go
 delete mode 100644 models/model_user_plane_location_area.go
 delete mode 100644 models/pfd_failure_code.go

diff --git a/models/model_access_token_req.go b/models/model_access_token_req.go
deleted file mode 100644
index 352f1fcf..00000000
--- a/models/model_access_token_req.go
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Nudr_DataRepository API OpenAPI file
- *
- * Unified Data Repository Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.504 V16.9.0; 5G System; Unified Data Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.504/
- *
- * API version: 2.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-// Contains information related to the access token request
-type AccessTokenReq struct {
-	GrantType           string   `json:"grant_type" yaml:"grant_type" bson:"grant_type,omitempty"`
-	NfInstanceId        string   `json:"nfInstanceId" yaml:"nfInstanceId" bson:"nfInstanceId,omitempty"`
-	NfType              NfType   `json:"nfType,omitempty" yaml:"nfType" bson:"nfType,omitempty"`
-	TargetNfType        NfType   `json:"targetNfType,omitempty" yaml:"targetNfType" bson:"targetNfType,omitempty"`
-	Scope               string   `json:"scope" yaml:"scope" bson:"scope,omitempty"`
-	TargetNfInstanceId  string   `json:"targetNfInstanceId,omitempty" yaml:"targetNfInstanceId" bson:"targetNfInstanceId,omitempty"`
-	RequesterPlmn       *PlmnId  `json:"requesterPlmn,omitempty" yaml:"requesterPlmn" bson:"requesterPlmn,omitempty"`
-	RequesterPlmnList   []PlmnId `json:"requesterPlmnList,omitempty" yaml:"requesterPlmnList" bson:"requesterPlmnList,omitempty"`
-	RequesterSnssaiList []Snssai `json:"requesterSnssaiList,omitempty" yaml:"requesterSnssaiList" bson:"requesterSnssaiList,omitempty"`
-	// Fully Qualified Domain Name
-	RequesterFqdn        string      `json:"requesterFqdn,omitempty" yaml:"requesterFqdn" bson:"requesterFqdn,omitempty"`
-	RequesterSnpnList    []PlmnIdNid `json:"requesterSnpnList,omitempty" yaml:"requesterSnpnList" bson:"requesterSnpnList,omitempty"`
-	TargetPlmn           *PlmnId     `json:"targetPlmn,omitempty" yaml:"targetPlmn" bson:"targetPlmn,omitempty"`
-	TargetSnssaiList     []Snssai    `json:"targetSnssaiList,omitempty" yaml:"targetSnssaiList" bson:"targetSnssaiList,omitempty"`
-	TargetNsiList        []string    `json:"targetNsiList,omitempty" yaml:"targetNsiList" bson:"targetNsiList,omitempty"`
-	TargetNfSetId        string      `json:"targetNfSetId,omitempty" yaml:"targetNfSetId" bson:"targetNfSetId,omitempty"`
-	TargetNfServiceSetId string      `json:"targetNfServiceSetId,omitempty" yaml:"targetNfServiceSetId" bson:"targetNfServiceSetId,omitempty"`
-}
diff --git a/models/model_access_token_req_1.go b/models/model_access_token_req_1.go
deleted file mode 100644
index 75b4a802..00000000
--- a/models/model_access_token_req_1.go
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * NRF OAuth2
- *
- * NRF OAuth2 Authorization. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.510 V16.8.0; 5G System; Network Function Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.510/
- *
- * API version: 1.1.3
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-// Contains information related to the access token request
-type AccessTokenReq1 struct {
-	GrantType           string   `json:"grant_type" yaml:"grant_type" bson:"grant_type,omitempty"`
-	NfInstanceId        string   `json:"nfInstanceId" yaml:"nfInstanceId" bson:"nfInstanceId,omitempty"`
-	NfType              NfType   `json:"nfType,omitempty" yaml:"nfType" bson:"nfType,omitempty"`
-	TargetNfType        NfType   `json:"targetNfType,omitempty" yaml:"targetNfType" bson:"targetNfType,omitempty"`
-	Scope               string   `json:"scope" yaml:"scope" bson:"scope,omitempty"`
-	TargetNfInstanceId  string   `json:"targetNfInstanceId,omitempty" yaml:"targetNfInstanceId" bson:"targetNfInstanceId,omitempty"`
-	RequesterPlmn       *PlmnId  `json:"requesterPlmn,omitempty" yaml:"requesterPlmn" bson:"requesterPlmn,omitempty"`
-	RequesterPlmnList   []PlmnId `json:"requesterPlmnList,omitempty" yaml:"requesterPlmnList" bson:"requesterPlmnList,omitempty"`
-	RequesterSnssaiList []Snssai `json:"requesterSnssaiList,omitempty" yaml:"requesterSnssaiList" bson:"requesterSnssaiList,omitempty"`
-	// Fully Qualified Domain Name
-	RequesterFqdn        string      `json:"requesterFqdn,omitempty" yaml:"requesterFqdn" bson:"requesterFqdn,omitempty"`
-	RequesterSnpnList    []PlmnIdNid `json:"requesterSnpnList,omitempty" yaml:"requesterSnpnList" bson:"requesterSnpnList,omitempty"`
-	TargetPlmn           *PlmnId     `json:"targetPlmn,omitempty" yaml:"targetPlmn" bson:"targetPlmn,omitempty"`
-	TargetSnssaiList     []Snssai    `json:"targetSnssaiList,omitempty" yaml:"targetSnssaiList" bson:"targetSnssaiList,omitempty"`
-	TargetNsiList        []string    `json:"targetNsiList,omitempty" yaml:"targetNsiList" bson:"targetNsiList,omitempty"`
-	TargetNfSetId        string      `json:"targetNfSetId,omitempty" yaml:"targetNfSetId" bson:"targetNfSetId,omitempty"`
-	TargetNfServiceSetId string      `json:"targetNfServiceSetId,omitempty" yaml:"targetNfServiceSetId" bson:"targetNfServiceSetId,omitempty"`
-}
diff --git a/models/model_access_token_rsp.go b/models/model_access_token_rsp.go
deleted file mode 100644
index 52a67d71..00000000
--- a/models/model_access_token_rsp.go
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * NRF OAuth2
- *
- * NRF OAuth2 Authorization. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.510 V16.8.0; 5G System; Network Function Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.510/
- *
- * API version: 1.1.3
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-// Contains information related to the access token response
-type AccessTokenRsp struct {
-	// JWS Compact Serialized representation of JWS signed JSON object (AccessTokenClaims)
-	AccessToken string `json:"access_token" yaml:"access_token" bson:"access_token,omitempty"`
-	TokenType   string `json:"token_type" yaml:"token_type" bson:"token_type,omitempty"`
-	ExpiresIn   int32  `json:"expires_in,omitempty" yaml:"expires_in" bson:"expires_in,omitempty"`
-	Scope       string `json:"scope,omitempty" yaml:"scope" bson:"scope,omitempty"`
-}
diff --git a/models/model_af_event.go b/models/model_af_event.go
deleted file mode 100644
index bc627f6c..00000000
--- a/models/model_af_event.go
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Npcf_PolicyAuthorization Service API
- *
- * PCF Policy Authorization Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.514 V16.10.0; 5G System; Policy Authorization Service;Stage 3.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.514/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type AfEvent string
-
-// List of AfEvent
-const (
-	AfEvent_ACCESS_TYPE_CHANGE              AfEvent = "ACCESS_TYPE_CHANGE"
-	AfEvent_ANI_REPORT                      AfEvent = "ANI_REPORT"
-	AfEvent_CHARGING_CORRELATION            AfEvent = "CHARGING_CORRELATION"
-	AfEvent_EPS_FALLBACK                    AfEvent = "EPS_FALLBACK"
-	AfEvent_FAILED_RESOURCES_ALLOCATION     AfEvent = "FAILED_RESOURCES_ALLOCATION"
-	AfEvent_OUT_OF_CREDIT                   AfEvent = "OUT_OF_CREDIT"
-	AfEvent_PLMN_CHG                        AfEvent = "PLMN_CHG"
-	AfEvent_QOS_MONITORING                  AfEvent = "QOS_MONITORING"
-	AfEvent_QOS_NOTIF                       AfEvent = "QOS_NOTIF"
-	AfEvent_RAN_NAS_CAUSE                   AfEvent = "RAN_NAS_CAUSE"
-	AfEvent_REALLOCATION_OF_CREDIT          AfEvent = "REALLOCATION_OF_CREDIT"
-	AfEvent_SUCCESSFUL_RESOURCES_ALLOCATION AfEvent = "SUCCESSFUL_RESOURCES_ALLOCATION"
-	AfEvent_TSN_BRIDGE_INFO                 AfEvent = "TSN_BRIDGE_INFO"
-	AfEvent_USAGE_REPORT                    AfEvent = "USAGE_REPORT"
-)
diff --git a/models/model_af_event_notification.go b/models/model_af_event_notification.go
deleted file mode 100644
index 098d2168..00000000
--- a/models/model_af_event_notification.go
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Npcf_PolicyAuthorization Service API
- *
- * PCF Policy Authorization Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.514 V16.10.0; 5G System; Policy Authorization Service;Stage 3.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.514/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-// describes the event information delivered in the notification
-type AfEventNotification struct {
-	Event AfEvent `json:"event" yaml:"event" bson:"event,omitempty"`
-	Flows []Flows `json:"flows,omitempty" yaml:"flows" bson:"flows,omitempty"`
-}
diff --git a/models/model_af_location_area.go b/models/model_af_location_area.go
deleted file mode 100644
index 78022520..00000000
--- a/models/model_af_location_area.go
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 3gpp-pfd-management
- *
- * API for PFD management. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.122 V16.9.0 T8 reference point for Northbound APIs
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.122/
- *
- * API version: 1.1.1
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type AFLocationArea struct {
-	// Indicates a list of Cell Global Identities of the user which identifies the cell the UE is registered.
-	CellIds []string `json:"cellIds,omitempty" yaml:"cellIds" bson:"cellIds"`
-	// Indicates a list of eNodeB identities in which the UE is currently located.
-	EnodeBIds []string `json:"enodeBIds,omitempty" yaml:"enodeBIds" bson:"enodeBIds"`
-	// Identifies a list of Routing Area Identities of the user where the UE is located.
-	RoutingAreaIds []string `json:"routingAreaIds,omitempty" yaml:"routingAreaIds" bson:"routingAreaIds"`
-	// Identifies a list of Tracking Area Identities of the user where the UE is located.
-	TrackingAreaIds []string `json:"trackingAreaIds,omitempty" yaml:"trackingAreaIds" bson:"trackingAreaIds"`
-	// Identifies a list of geographic area of the user where the UE is located.
-	GeographicAreas []GeographicArea `json:"geographicAreas,omitempty" yaml:"geographicAreas" bson:"geographicAreas"`
-	// Identifies a list of civic addresses of the user where the UE is located.
-	CivicAddresses []CivicAddress `json:"civicAddresses,omitempty" yaml:"civicAddresses" bson:"civicAddresses"`
-}
diff --git a/models/model_af_location_area5_g.go b/models/model_af_location_area5_g.go
deleted file mode 100644
index e5129974..00000000
--- a/models/model_af_location_area5_g.go
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * 3gpp-pfd-management
- *
- * API for PFD management. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.122 V16.9.0 T8 reference point for Northbound APIs
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.122/
- *
- * API version: 1.1.1
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type AFLocationArea5G struct {
-	// Identifies a list of geographic area of the user where the UE is located.
-	GeographicAreas []GeographicArea `json:"geographicAreas,omitempty" yaml:"geographicAreas" bson:"geographicAreas"`
-	// Identifies a list of civic addresses of the user where the UE is located.
-	CivicAddresses []CivicAddress   `json:"civicAddresses,omitempty" yaml:"civicAddresses" bson:"civicAddresses"`
-	NwAreaInfo     *NetworkAreaInfo `json:"nwAreaInfo,omitempty" yaml:"nwAreaInfo" bson:"nwAreaInfo"`
-}
diff --git a/models/model_am_policy_association.go b/models/model_am_policy_association.go
deleted file mode 100644
index f7f44383..00000000
--- a/models/model_am_policy_association.go
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Npcf_AMPolicyControl
- *
- * Access and Mobility Policy Control Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.507 V16.9.0; 5G System; Access and Mobility Policy Control Service.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.507/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type AmPolicyAssociation struct {
-	Request *AmPolicyAssociationRequest `json:"request,omitempty" yaml:"request" bson:"request,omitempty"`
-	// Request Triggers that the PCF subscribes.
-	Triggers      []PcfAmPolicyControlRequestTrigger `json:"triggers,omitempty" yaml:"triggers" bson:"triggers,omitempty"`
-	ServAreaRes   *ServiceAreaRestriction            `json:"servAreaRes,omitempty" yaml:"servAreaRes" bson:"servAreaRes,omitempty"`
-	WlServAreaRes *WirelineServiceAreaRestriction    `json:"wlServAreaRes,omitempty" yaml:"wlServAreaRes" bson:"wlServAreaRes,omitempty"`
-	Rfsp          int32                              `json:"rfsp,omitempty" yaml:"rfsp" bson:"rfsp,omitempty"`
-	SmfSelInfo    *SmfSelectionData                  `json:"smfSelInfo,omitempty" yaml:"smfSelInfo" bson:"smfSelInfo,omitempty"`
-	UeAmbr        *Ambr                              `json:"ueAmbr,omitempty" yaml:"ueAmbr" bson:"ueAmbr,omitempty"`
-	Pras          map[string]PresenceInfo            `json:"pras,omitempty" yaml:"pras" bson:"pras,omitempty"`
-	SuppFeat      string                             `json:"suppFeat" yaml:"suppFeat" bson:"suppFeat,omitempty"`
-}
diff --git a/models/model_am_policy_association_release_cause.go b/models/model_am_policy_association_release_cause.go
deleted file mode 100644
index cf439f8c..00000000
--- a/models/model_am_policy_association_release_cause.go
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Npcf_AMPolicyControl
- *
- * Access and Mobility Policy Control Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.507 V16.9.0; 5G System; Access and Mobility Policy Control Service.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.507/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type AmPolicyAssociationReleaseCause string
-
-// List of AmPolicyAssociationReleaseCause
-const (
-	AmPolicyAssociationReleaseCause_UNSPECIFIED      AmPolicyAssociationReleaseCause = "UNSPECIFIED"
-	AmPolicyAssociationReleaseCause_UE_SUBSCRIPTION  AmPolicyAssociationReleaseCause = "UE_SUBSCRIPTION"
-	AmPolicyAssociationReleaseCause_INSUFFICIENT_RES AmPolicyAssociationReleaseCause = "INSUFFICIENT_RES"
-)
diff --git a/models/model_am_policy_association_request.go b/models/model_am_policy_association_request.go
deleted file mode 100644
index f61981d4..00000000
--- a/models/model_am_policy_association_request.go
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Npcf_AMPolicyControl
- *
- * Access and Mobility Policy Control Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.507 V16.9.0; 5G System; Access and Mobility Policy Control Service.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.507/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-// Information which the NF service consumer provides when requesting the creation of a policy association. The serviveName property corresponds to the serviceName in the main body of the specification.
-type AmPolicyAssociationRequest struct {
-	NotificationUri string `json:"notificationUri" yaml:"notificationUri" bson:"notificationUri,omitempty"`
-	// Alternate or backup IPv4 Address(es) where to send Notifications.
-	AltNotifIpv4Addrs []string `json:"altNotifIpv4Addrs,omitempty" yaml:"altNotifIpv4Addrs" bson:"altNotifIpv4Addrs,omitempty"`
-	// Alternate or backup IPv6 Address(es) where to send Notifications.
-	AltNotifIpv6Addrs []string `json:"altNotifIpv6Addrs,omitempty" yaml:"altNotifIpv6Addrs" bson:"altNotifIpv6Addrs,omitempty"`
-	// Alternate or backup FQDN(s) where to send Notifications.
-	AltNotifFqdns []string                        `json:"altNotifFqdns,omitempty" yaml:"altNotifFqdns" bson:"altNotifFqdns,omitempty"`
-	Supi          string                          `json:"supi" yaml:"supi" bson:"supi,omitempty"`
-	Gpsi          string                          `json:"gpsi,omitempty" yaml:"gpsi" bson:"gpsi,omitempty"`
-	AccessType    AccessType                      `json:"accessType,omitempty" yaml:"accessType" bson:"accessType,omitempty"`
-	AccessTypes   []AccessType                    `json:"accessTypes,omitempty" yaml:"accessTypes" bson:"accessTypes,omitempty"`
-	Pei           string                          `json:"pei,omitempty" yaml:"pei" bson:"pei,omitempty"`
-	UserLoc       *UserLocation                   `json:"userLoc,omitempty" yaml:"userLoc" bson:"userLoc,omitempty"`
-	TimeZone      string                          `json:"timeZone,omitempty" yaml:"timeZone" bson:"timeZone,omitempty"`
-	ServingPlmn   *PlmnIdNid                      `json:"servingPlmn,omitempty" yaml:"servingPlmn" bson:"servingPlmn,omitempty"`
-	RatType       RatType                         `json:"ratType,omitempty" yaml:"ratType" bson:"ratType,omitempty"`
-	RatTypes      []RatType                       `json:"ratTypes,omitempty" yaml:"ratTypes" bson:"ratTypes,omitempty"`
-	GroupIds      []string                        `json:"groupIds,omitempty" yaml:"groupIds" bson:"groupIds,omitempty"`
-	ServAreaRes   *ServiceAreaRestriction         `json:"servAreaRes,omitempty" yaml:"servAreaRes" bson:"servAreaRes,omitempty"`
-	WlServAreaRes *WirelineServiceAreaRestriction `json:"wlServAreaRes,omitempty" yaml:"wlServAreaRes" bson:"wlServAreaRes,omitempty"`
-	Rfsp          int32                           `json:"rfsp,omitempty" yaml:"rfsp" bson:"rfsp,omitempty"`
-	UeAmbr        *Ambr                           `json:"ueAmbr,omitempty" yaml:"ueAmbr" bson:"ueAmbr,omitempty"`
-	// array of allowed S-NSSAIs for the 3GPP access.
-	AllowedSnssais []Snssai `json:"allowedSnssais,omitempty" yaml:"allowedSnssais" bson:"allowedSnssais,omitempty"`
-	// mapping of each S-NSSAI of the Allowed NSSAI to the corresponding S-NSSAI of the HPLMN.
-	MappingSnssais []MappingOfSnssai `json:"mappingSnssais,omitempty" yaml:"mappingSnssais" bson:"mappingSnssais,omitempty"`
-	// array of allowed S-NSSAIs for the Non-3GPP access.
-	N3gAllowedSnssais []Snssai    `json:"n3gAllowedSnssais,omitempty" yaml:"n3gAllowedSnssais" bson:"n3gAllowedSnssais,omitempty"`
-	Guami             *Guami      `json:"guami,omitempty" yaml:"guami" bson:"guami,omitempty"`
-	ServiveName       ServiceName `json:"serviveName,omitempty" yaml:"serviveName" bson:"serviveName,omitempty"`
-	TraceReq          *TraceData  `json:"traceReq,omitempty" yaml:"traceReq" bson:"traceReq,omitempty"`
-	SuppFeat          string      `json:"suppFeat" yaml:"suppFeat" bson:"suppFeat,omitempty"`
-}
diff --git a/models/model_am_policy_association_update_request.go b/models/model_am_policy_association_update_request.go
deleted file mode 100644
index 4d9ae384..00000000
--- a/models/model_am_policy_association_update_request.go
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Npcf_AMPolicyControl
- *
- * Access and Mobility Policy Control Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.507 V16.9.0; 5G System; Access and Mobility Policy Control Service.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.507/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type AmPolicyAssociationUpdateRequest struct {
-	NotificationUri string `json:"notificationUri,omitempty" yaml:"notificationUri" bson:"notificationUri,omitempty"`
-	// Alternate or backup IPv4 Address(es) where to send Notifications.
-	AltNotifIpv4Addrs []string `json:"altNotifIpv4Addrs,omitempty" yaml:"altNotifIpv4Addrs" bson:"altNotifIpv4Addrs,omitempty"`
-	// Alternate or backup IPv6 Address(es) where to send Notifications.
-	AltNotifIpv6Addrs []string `json:"altNotifIpv6Addrs,omitempty" yaml:"altNotifIpv6Addrs" bson:"altNotifIpv6Addrs,omitempty"`
-	// Alternate or backup FQDN(s) where to send Notifications.
-	AltNotifFqdns []string `json:"altNotifFqdns,omitempty" yaml:"altNotifFqdns" bson:"altNotifFqdns,omitempty"`
-	// Request Triggers that the NF service consumer observes.
-	Triggers      []PcfAmPolicyControlRequestTrigger `json:"triggers,omitempty" yaml:"triggers" bson:"triggers,omitempty"`
-	ServAreaRes   *ServiceAreaRestriction            `json:"servAreaRes,omitempty" yaml:"servAreaRes" bson:"servAreaRes,omitempty"`
-	WlServAreaRes *WirelineServiceAreaRestriction    `json:"wlServAreaRes,omitempty" yaml:"wlServAreaRes" bson:"wlServAreaRes,omitempty"`
-	Rfsp          int32                              `json:"rfsp,omitempty" yaml:"rfsp" bson:"rfsp,omitempty"`
-	SmfSelInfo    *SmfSelectionData                  `json:"smfSelInfo,omitempty" yaml:"smfSelInfo" bson:"smfSelInfo,omitempty"`
-	UeAmbr        *Ambr                              `json:"ueAmbr,omitempty" yaml:"ueAmbr" bson:"ueAmbr,omitempty"`
-	// Map of PRA status information.
-	PraStatuses map[string]PresenceInfo `json:"praStatuses,omitempty" yaml:"praStatuses" bson:"praStatuses,omitempty"`
-	UserLoc     *UserLocation           `json:"userLoc,omitempty" yaml:"userLoc" bson:"userLoc,omitempty"`
-	// array of allowed S-NSSAIs for the 3GPP access.
-	AllowedSnssais []Snssai `json:"allowedSnssais,omitempty" yaml:"allowedSnssais" bson:"allowedSnssais,omitempty"`
-	// mapping of each S-NSSAI of the Allowed NSSAI to the corresponding S-NSSAI of the HPLMN.
-	MappingSnssais []MappingOfSnssai `json:"mappingSnssais,omitempty" yaml:"mappingSnssais" bson:"mappingSnssais,omitempty"`
-	AccessTypes    []AccessType      `json:"accessTypes,omitempty" yaml:"accessTypes" bson:"accessTypes,omitempty"`
-	RatTypes       []RatType         `json:"ratTypes,omitempty" yaml:"ratTypes" bson:"ratTypes,omitempty"`
-	// array of allowed S-NSSAIs for the Non-3GPP access.
-	N3gAllowedSnssais []Snssai   `json:"n3gAllowedSnssais,omitempty" yaml:"n3gAllowedSnssais" bson:"n3gAllowedSnssais,omitempty"`
-	TraceReq          *TraceData `json:"traceReq,omitempty" yaml:"traceReq" bson:"traceReq,omitempty"`
-	Guami             *Guami     `json:"guami,omitempty" yaml:"guami" bson:"guami,omitempty"`
-}
diff --git a/models/model_am_policy_termination_notification.go b/models/model_am_policy_termination_notification.go
deleted file mode 100644
index e1d01030..00000000
--- a/models/model_am_policy_termination_notification.go
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Npcf_AMPolicyControl
- *
- * Access and Mobility Policy Control Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.507 V16.9.0; 5G System; Access and Mobility Policy Control Service.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.507/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type AmPolicyTerminationNotification struct {
-	ResourceUri string                          `json:"resourceUri" yaml:"resourceUri" bson:"resourceUri,omitempty"`
-	Cause       AmPolicyAssociationReleaseCause `json:"cause" yaml:"cause" bson:"cause,omitempty"`
-}
diff --git a/models/model_am_policy_update.go b/models/model_am_policy_update.go
deleted file mode 100644
index 3464c44a..00000000
--- a/models/model_am_policy_update.go
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Npcf_AMPolicyControl
- *
- * Access and Mobility Policy Control Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.507 V16.9.0; 5G System; Access and Mobility Policy Control Service.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.507/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type AmPolicyUpdate struct {
-	ResourceUri string `json:"resourceUri" yaml:"resourceUri" bson:"resourceUri,omitempty"`
-	// Request Triggers that the PCF subscribes.
-	Triggers      []PcfAmPolicyControlRequestTrigger `json:"triggers,omitempty" yaml:"triggers" bson:"triggers,omitempty"`
-	ServAreaRes   *ServiceAreaRestriction            `json:"servAreaRes,omitempty" yaml:"servAreaRes" bson:"servAreaRes,omitempty"`
-	WlServAreaRes *WirelineServiceAreaRestriction    `json:"wlServAreaRes,omitempty" yaml:"wlServAreaRes" bson:"wlServAreaRes,omitempty"`
-	Rfsp          int32                              `json:"rfsp,omitempty" yaml:"rfsp" bson:"rfsp,omitempty"`
-	SmfSelInfo    *SmfSelectionData                  `json:"smfSelInfo,omitempty" yaml:"smfSelInfo" bson:"smfSelInfo,omitempty"`
-	UeAmbr        *Ambr                              `json:"ueAmbr,omitempty" yaml:"ueAmbr" bson:"ueAmbr,omitempty"`
-	// Map of PRA information.
-	Pras map[string]*PresenceInfoRm `json:"pras,omitempty" yaml:"pras" bson:"pras,omitempty"`
-}
diff --git a/models/model_amf_info.go b/models/model_amf_info.go
deleted file mode 100644
index fdbb924d..00000000
--- a/models/model_amf_info.go
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * NRF NFManagement Service
- *
- * NRF NFManagement Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.510 V16.9.0; 5G System; Network Function Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.510/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-// Information of an AMF NF Instance
-type AmfInfo struct {
-	AmfSetId             string              `json:"amfSetId" yaml:"amfSetId" bson:"amfSetId,omitempty"`
-	AmfRegionId          string              `json:"amfRegionId" yaml:"amfRegionId" bson:"amfRegionId,omitempty"`
-	GuamiList            []Guami             `json:"guamiList" yaml:"guamiList" bson:"guamiList,omitempty"`
-	TaiList              []Tai               `json:"taiList,omitempty" yaml:"taiList" bson:"taiList,omitempty"`
-	TaiRangeList         []TaiRange          `json:"taiRangeList,omitempty" yaml:"taiRangeList" bson:"taiRangeList,omitempty"`
-	BackupInfoAmfFailure []Guami             `json:"backupInfoAmfFailure,omitempty" yaml:"backupInfoAmfFailure" bson:"backupInfoAmfFailure,omitempty"`
-	BackupInfoAmfRemoval []Guami             `json:"backupInfoAmfRemoval,omitempty" yaml:"backupInfoAmfRemoval" bson:"backupInfoAmfRemoval,omitempty"`
-	N2InterfaceAmfInfo   *N2InterfaceAmfInfo `json:"n2InterfaceAmfInfo,omitempty" yaml:"n2InterfaceAmfInfo" bson:"n2InterfaceAmfInfo,omitempty"`
-}
diff --git a/models/model_association_type.go b/models/model_association_type.go
deleted file mode 100644
index 2ca1502a..00000000
--- a/models/model_association_type.go
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Nudr_DataRepository API OpenAPI file
- *
- * Unified Data Repository Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.504 V16.9.0; 5G System; Unified Data Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.504/
- *
- * API version: 2.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type AssociationType string
-
-// List of AssociationType
-const (
-	AssociationType_IMEI_CHANGE   AssociationType = "IMEI_CHANGE"
-	AssociationType_IMEISV_CHANGE AssociationType = "IMEISV_CHANGE"
-)
diff --git a/models/model_auth_result.go b/models/model_auth_result.go
deleted file mode 100644
index 16b667e7..00000000
--- a/models/model_auth_result.go
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * AUSF API
- *
- * AUSF UE Authentication Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.509 V16.7.0; 5G System; 3GPP TS Authentication Server services.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.509
- *
- * API version: 1.1.2
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type AuthResult string
-
-// List of AuthResult
-const (
-	AuthResult_SUCCESS AuthResult = "AUTHENTICATION_SUCCESS"
-	AuthResult_FAILURE AuthResult = "AUTHENTICATION_FAILURE"
-	AuthResult_ONGOING AuthResult = "AUTHENTICATION_ONGOING"
-)
diff --git a/models/model_auth_type.go b/models/model_auth_type.go
deleted file mode 100644
index 482d67c6..00000000
--- a/models/model_auth_type.go
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Nudr_DataRepository API OpenAPI file
- *
- * Unified Data Repository Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.504 V16.9.0; 5G System; Unified Data Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.504/
- *
- * API version: 2.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type AuthType string
-
-// List of AuthType
-const (
-	AuthType__5_G_AKA      AuthType = "5G_AKA"
-	AuthType_EAP_AKA_PRIME AuthType = "EAP_AKA_PRIME"
-	AuthType_EAP_TLS       AuthType = "EAP_TLS"
-)
diff --git a/models/model_bdt_policy_bdt_policy_data.go b/models/model_bdt_policy_bdt_policy_data.go
deleted file mode 100644
index c3c76b2c..00000000
--- a/models/model_bdt_policy_bdt_policy_data.go
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Npcf_BDTPolicyControl Service API
- *
- * PCF BDT Policy Control Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.554 V16.7.0; 5G System; Background Data Transfer Policy Control Service.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.554/
- *
- * API version: 1.1.3
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-// Describes the authorization data of an Individual BDT policy resource.
-type BdtPolicyBdtPolicyData struct {
-	// string identifying a BDT Reference ID as defined in subclause 5.3.3 of 3GPP TS 29.154.
-	BdtRefId string `json:"bdtRefId" yaml:"bdtRefId" bson:"bdtRefId,omitempty"`
-	// Contains transfer policies.
-	TransfPolicies []TransferPolicy `json:"transfPolicies" yaml:"transfPolicies" bson:"transfPolicies,omitempty"`
-	// Contains an identity of the selected transfer policy.
-	SelTransPolicyId int32  `json:"selTransPolicyId,omitempty" yaml:"selTransPolicyId" bson:"selTransPolicyId,omitempty"`
-	SuppFeat         string `json:"suppFeat,omitempty" yaml:"suppFeat" bson:"suppFeat,omitempty"`
-}
diff --git a/models/model_bdt_policy_bdt_policy_data_patch.go b/models/model_bdt_policy_bdt_policy_data_patch.go
deleted file mode 100644
index fd182c5c..00000000
--- a/models/model_bdt_policy_bdt_policy_data_patch.go
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Npcf_BDTPolicyControl Service API
- *
- * PCF BDT Policy Control Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.554 V16.7.0; 5G System; Background Data Transfer Policy Control Service.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.554/
- *
- * API version: 1.1.3
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-// A JSON Merge Patch body schema containing modification instruction to be performed on the bdtPolData attribute of the BdtPolicy data structure to select a transfer policy. Adds selTransPolicyId to BdtPolicyData data structure.
-type BdtPolicyBdtPolicyDataPatch struct {
-	// Contains an identity (i.e. transPolicyId value) of the selected transfer policy. If the BdtNotification_5G feature is supported value 0 indicates that no transfer policy is selected.
-	SelTransPolicyId int32 `json:"selTransPolicyId" yaml:"selTransPolicyId" bson:"selTransPolicyId,omitempty"`
-}
diff --git a/models/model_bdt_policy_bdt_req_data_patch.go b/models/model_bdt_policy_bdt_req_data_patch.go
deleted file mode 100644
index 11550665..00000000
--- a/models/model_bdt_policy_bdt_req_data_patch.go
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Npcf_BDTPolicyControl Service API
- *
- * PCF BDT Policy Control Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.554 V16.7.0; 5G System; Background Data Transfer Policy Control Service.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.554/
- *
- * API version: 1.1.3
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-// A JSON Merge Patch body schema containing modification instruction to be performed on the bdtReqData attribute of the BdtPolicy data structure to indicate whether the BDT warning notification is enabled or disabled. Modifies warnNotifReq from BdtReqData data structure.
-type BdtPolicyBdtReqDataPatch struct {
-	// Indicates whether the BDT warning notification is enabled or disabled.
-	WarnNotifReq bool `json:"warnNotifReq,omitempty" yaml:"warnNotifReq" bson:"warnNotifReq,omitempty"`
-}
diff --git a/models/model_bdt_policy_patch_bdt_policy.go b/models/model_bdt_policy_patch_bdt_policy.go
deleted file mode 100644
index ea40130e..00000000
--- a/models/model_bdt_policy_patch_bdt_policy.go
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Npcf_BDTPolicyControl Service API
- *
- * PCF BDT Policy Control Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.554 V16.7.0; 5G System; Background Data Transfer Policy Control Service.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.554/
- *
- * API version: 1.1.3
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-// Describes the updates in authorization data of an Individual BDT Policy created by the PCF.
-type BdtPolicyPatchBdtPolicy struct {
-	BdtPolData *BdtPolicyBdtPolicyDataPatch `json:"bdtPolData,omitempty" yaml:"bdtPolData" bson:"bdtPolData,omitempty"`
-	BdtReqData *BdtPolicyBdtReqDataPatch    `json:"bdtReqData,omitempty" yaml:"bdtReqData" bson:"bdtReqData,omitempty"`
-}
diff --git a/models/model_bsf_info.go b/models/model_bsf_info.go
deleted file mode 100644
index ef97e2c6..00000000
--- a/models/model_bsf_info.go
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * NRF NFManagement Service
- *
- * NRF NFManagement Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.510 V16.9.0; 5G System; Network Function Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.510/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-// Information of a BSF NF Instance
-type BsfInfo struct {
-	DnnList           []string           `json:"dnnList,omitempty" yaml:"dnnList" bson:"dnnList,omitempty"`
-	IpDomainList      []string           `json:"ipDomainList,omitempty" yaml:"ipDomainList" bson:"ipDomainList,omitempty"`
-	Ipv4AddressRanges []Ipv4AddressRange `json:"ipv4AddressRanges,omitempty" yaml:"ipv4AddressRanges" bson:"ipv4AddressRanges,omitempty"`
-	Ipv6PrefixRanges  []Ipv6PrefixRange  `json:"ipv6PrefixRanges,omitempty" yaml:"ipv6PrefixRanges" bson:"ipv6PrefixRanges,omitempty"`
-}
diff --git a/models/model_cause.go b/models/model_cause.go
deleted file mode 100644
index d2ac5fd8..00000000
--- a/models/model_cause.go
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Nsmf_PDUSession
- *
- * SMF PDU Session Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.502 V16.9.0; 5G System; Session Management Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.502/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type Cause string
-
-// List of Cause
-const (
-	Cause_REL_DUE_TO_HO                     Cause = "REL_DUE_TO_HO"
-	Cause_EPS_FALLBACK                      Cause = "EPS_FALLBACK"
-	Cause_REL_DUE_TO_UP_SEC                 Cause = "REL_DUE_TO_UP_SEC"
-	Cause_DNN_CONGESTION                    Cause = "DNN_CONGESTION"
-	Cause_S_NSSAI_CONGESTION                Cause = "S_NSSAI_CONGESTION"
-	Cause_REL_DUE_TO_REACTIVATION           Cause = "REL_DUE_TO_REACTIVATION"
-	Cause__5_G_AN_NOT_RESPONDING            Cause = "5G_AN_NOT_RESPONDING"
-	Cause_REL_DUE_TO_SLICE_NOT_AVAILABLE    Cause = "REL_DUE_TO_SLICE_NOT_AVAILABLE"
-	Cause_REL_DUE_TO_DUPLICATE_SESSION_ID   Cause = "REL_DUE_TO_DUPLICATE_SESSION_ID"
-	Cause_PDU_SESSION_STATUS_MISMATCH       Cause = "PDU_SESSION_STATUS_MISMATCH"
-	Cause_HO_FAILURE                        Cause = "HO_FAILURE"
-	Cause_INSUFFICIENT_UP_RESOURCES         Cause = "INSUFFICIENT_UP_RESOURCES"
-	Cause_PDU_SESSION_HANDED_OVER           Cause = "PDU_SESSION_HANDED_OVER"
-	Cause_PDU_SESSION_RESUMED               Cause = "PDU_SESSION_RESUMED"
-	Cause_CN_ASSISTED_RAN_PARAMETER_TUNING  Cause = "CN_ASSISTED_RAN_PARAMETER_TUNING"
-	Cause_ISMF_CONTEXT_TRANSFER             Cause = "ISMF_CONTEXT_TRANSFER"
-	Cause_SMF_CONTEXT_TRANSFER              Cause = "SMF_CONTEXT_TRANSFER"
-	Cause_REL_DUE_TO_PS_TO_CS_HO            Cause = "REL_DUE_TO_PS_TO_CS_HO"
-	Cause_REL_DUE_TO_SUBSCRIPTION_CHANGE    Cause = "REL_DUE_TO_SUBSCRIPTION_CHANGE"
-	Cause_HO_CANCEL                         Cause = "HO_CANCEL"
-	Cause_REL_DUE_TO_SLICE_NOT_AUTHORIZED   Cause = "REL_DUE_TO_SLICE_NOT_AUTHORIZED"
-	Cause_PDU_SESSION_HAND_OVER_FAILURE     Cause = "PDU_SESSION_HAND_OVER_FAILURE"
-	Cause_DDN_FAILURE_STATUS                Cause = "DDN_FAILURE_STATUS"
-	Cause_REL_DUE_TO_CP_ONLY_NOT_APPLICABLE Cause = "REL_DUE_TO_CP_ONLY_NOT_APPLICABLE"
-	Cause_NOT_SUPPORTED_WITH_ISMF           Cause = "NOT_SUPPORTED_WITH_ISMF"
-	Cause_CHANGED_ANCHOR_SMF                Cause = "CHANGED_ANCHOR_SMF"
-	Cause_CHANGED_INTERMEDIATE_SMF          Cause = "CHANGED_INTERMEDIATE_SMF"
-)
diff --git a/models/model_dr_bdt_data.go b/models/model_dr_bdt_data.go
deleted file mode 100644
index 9024c642..00000000
--- a/models/model_dr_bdt_data.go
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Nudr_DataRepository API OpenAPI file
- *
- * Unified Data Repository Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.504 V16.9.0; 5G System; Unified Data Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.504/
- *
- * API version: 2.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-// Contains the background data transfer data.
-type DrBdtData struct {
-	AspId       string          `json:"aspId" yaml:"aspId" bson:"aspId,omitempty"`
-	TransPolicy *TransferPolicy `json:"transPolicy" yaml:"transPolicy" bson:"transPolicy,omitempty"`
-	// string identifying a BDT Reference ID as defined in subclause 5.3.3 of 3GPP TS 29.154.
-	BdtRefId   string           `json:"bdtRefId,omitempty" yaml:"bdtRefId" bson:"bdtRefId,omitempty"`
-	NwAreaInfo *NetworkAreaInfo `json:"nwAreaInfo,omitempty" yaml:"nwAreaInfo" bson:"nwAreaInfo,omitempty"`
-	NumOfUes   int32            `json:"numOfUes,omitempty" yaml:"numOfUes" bson:"numOfUes,omitempty"`
-	VolPerUe   *UsageThreshold  `json:"volPerUe,omitempty" yaml:"volPerUe" bson:"volPerUe,omitempty"`
-	Dnn        string           `json:"dnn,omitempty" yaml:"dnn" bson:"dnn,omitempty"`
-	Snssai     *Snssai          `json:"snssai,omitempty" yaml:"snssai" bson:"snssai,omitempty"`
-	// Identify a traffic descriptor as defined in Figure 5.2.2 of 3GPP TS 24.526, octets v+5 to w.
-	TrafficDes string          `json:"trafficDes,omitempty" yaml:"trafficDes" bson:"trafficDes,omitempty"`
-	BdtpStatus BdtPolicyStatus `json:"bdtpStatus,omitempty" yaml:"bdtpStatus" bson:"bdtpStatus,omitempty"`
-	SuppFeat   string          `json:"suppFeat,omitempty" yaml:"suppFeat" bson:"suppFeat,omitempty"`
-}
diff --git a/models/model_dr_bdt_policy_data.go b/models/model_dr_bdt_policy_data.go
deleted file mode 100644
index ba67ede0..00000000
--- a/models/model_dr_bdt_policy_data.go
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Nudr_DataRepository API OpenAPI file
- *
- * Unified Data Repository Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.504 V16.9.0; 5G System; Unified Data Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.504/
- *
- * API version: 2.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type DrBdtPolicyData struct {
-	InterGroupId string `json:"interGroupId,omitempty" yaml:"interGroupId" bson:"interGroupId,omitempty"`
-	Supi         string `json:"supi,omitempty" yaml:"supi" bson:"supi,omitempty"`
-	// string identifying a BDT Reference ID as defined in subclause 5.3.3 of 3GPP TS 29.154.
-	BdtRefId string  `json:"bdtRefId" yaml:"bdtRefId" bson:"bdtRefId,omitempty"`
-	Dnn      string  `json:"dnn,omitempty" yaml:"dnn" bson:"dnn,omitempty"`
-	Snssai   *Snssai `json:"snssai,omitempty" yaml:"snssai" bson:"snssai,omitempty"`
-	ResUri   string  `json:"resUri,omitempty" yaml:"resUri" bson:"resUri,omitempty"`
-}
diff --git a/models/model_dr_bdt_policy_data_patch.go b/models/model_dr_bdt_policy_data_patch.go
deleted file mode 100644
index c45df6f3..00000000
--- a/models/model_dr_bdt_policy_data_patch.go
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Nudr_DataRepository API OpenAPI file
- *
- * Unified Data Repository Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.504 V16.9.0; 5G System; Unified Data Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.504/
- *
- * API version: 2.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type DrBdtPolicyDataPatch struct {
-	// string identifying a BDT Reference ID as defined in subclause 5.3.3 of 3GPP TS 29.154.
-	BdtRefId string `json:"bdtRefId" yaml:"bdtRefId" bson:"bdtRefId,omitempty"`
-}
diff --git a/models/model_dr_data_set_name.go b/models/model_dr_data_set_name.go
deleted file mode 100644
index 60e04fc2..00000000
--- a/models/model_dr_data_set_name.go
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Nudr_DataRepository API OpenAPI file
- *
- * Unified Data Repository Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.504 V16.9.0; 5G System; Unified Data Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.504/
- *
- * API version: 2.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type DrDataSetName string
-
-// List of DRDataSetName
-const (
-	DrDataSetName_AM          DrDataSetName = "AM"
-	DrDataSetName_SMF_SEL     DrDataSetName = "SMF_SEL"
-	DrDataSetName_SMS_SUB     DrDataSetName = "SMS_SUB"
-	DrDataSetName_SM          DrDataSetName = "SM"
-	DrDataSetName_TRACE       DrDataSetName = "TRACE"
-	DrDataSetName_SMS_MNG     DrDataSetName = "SMS_MNG"
-	DrDataSetName_LCS_PRIVACY DrDataSetName = "LCS_PRIVACY"
-	DrDataSetName_LCS_MO      DrDataSetName = "LCS_MO"
-	DrDataSetName_LCS_BCA     DrDataSetName = "LCS_BCA"
-	DrDataSetName_V2_X        DrDataSetName = "V2X"
-)
diff --git a/models/model_ec_restriction_data_wb.go b/models/model_ec_restriction_data_wb.go
deleted file mode 100644
index c3dc29f1..00000000
--- a/models/model_ec_restriction_data_wb.go
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Nudr_DataRepository API OpenAPI file
- *
- * Unified Data Repository Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.504 V16.9.0; 5G System; Unified Data Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.504/
- *
- * API version: 2.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type EcRestrictionDataWb struct {
-	EcModeARestricted bool `json:"ecModeARestricted,omitempty" yaml:"ecModeARestricted" bson:"ecModeARestricted,omitempty"`
-	EcModeBRestricted bool `json:"ecModeBRestricted,omitempty" yaml:"ecModeBRestricted" bson:"ecModeBRestricted,omitempty"`
-}
diff --git a/models/model_event_subscription.go b/models/model_event_subscription.go
deleted file mode 100644
index 77d6ed90..00000000
--- a/models/model_event_subscription.go
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Nsmf_EventExposure
- *
- * Session Management Event Exposure Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.508 V16.8.0; 5G System; Session Management Event Exposure Service.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.508/
- *
- * API version: 1.1.2
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type EventSubscription struct {
-	Event             SmfEvent               `json:"event" yaml:"event" bson:"event,omitempty"`
-	DnaiChgType       DnaiChangeType         `json:"dnaiChgType,omitempty" yaml:"dnaiChgType" bson:"dnaiChgType,omitempty"`
-	DddTraDescriptors []DddTrafficDescriptor `json:"dddTraDescriptors,omitempty" yaml:"dddTraDescriptors" bson:"dddTraDescriptors,omitempty"`
-	DddStati          []DlDataDeliveryStatus `json:"dddStati,omitempty" yaml:"dddStati" bson:"dddStati,omitempty"`
-	AppIds            []string               `json:"appIds,omitempty" yaml:"appIds" bson:"appIds,omitempty"`
-}
diff --git a/models/model_event_type.go b/models/model_event_type.go
deleted file mode 100644
index c18edac6..00000000
--- a/models/model_event_type.go
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Nudr_DataRepository API OpenAPI file
- *
- * Unified Data Repository Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.504 V16.9.0; 5G System; Unified Data Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.504/
- *
- * API version: 2.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type EventType string
-
-// List of EventType
-const (
-	EventType_LOSS_OF_CONNECTIVITY           EventType = "LOSS_OF_CONNECTIVITY"
-	EventType_UE_REACHABILITY_FOR_DATA       EventType = "UE_REACHABILITY_FOR_DATA"
-	EventType_UE_REACHABILITY_FOR_SMS        EventType = "UE_REACHABILITY_FOR_SMS"
-	EventType_LOCATION_REPORTING             EventType = "LOCATION_REPORTING"
-	EventType_CHANGE_OF_SUPI_PEI_ASSOCIATION EventType = "CHANGE_OF_SUPI_PEI_ASSOCIATION"
-	EventType_ROAMING_STATUS                 EventType = "ROAMING_STATUS"
-	EventType_COMMUNICATION_FAILURE          EventType = "COMMUNICATION_FAILURE"
-	EventType_AVAILABILITY_AFTER_DDN_FAILURE EventType = "AVAILABILITY_AFTER_DDN_FAILURE"
-	EventType_CN_TYPE_CHANGE                 EventType = "CN_TYPE_CHANGE"
-	EventType_DL_DATA_DELIVERY_STATUS        EventType = "DL_DATA_DELIVERY_STATUS"
-	EventType_PDN_CONNECTIVITY_STATUS        EventType = "PDN_CONNECTIVITY_STATUS"
-	EventType_UE_CONNECTION_MANAGEMENT_STATE EventType = "UE_CONNECTION_MANAGEMENT_STATE"
-)
diff --git a/models/model_events_notification.go b/models/model_events_notification.go
deleted file mode 100644
index 6cec1d3e..00000000
--- a/models/model_events_notification.go
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Npcf_PolicyAuthorization Service API
- *
- * PCF Policy Authorization Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.514 V16.10.0; 5G System; Policy Authorization Service;Stage 3.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.514/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-import (
-	"time"
-)
-
-// describes the notification of a matched event
-type EventsNotification struct {
-	AccessType                AccessType                             `json:"accessType,omitempty" yaml:"accessType" bson:"accessType,omitempty"`
-	AddAccessInfo             *AdditionalAccessInfo                  `json:"addAccessInfo,omitempty" yaml:"addAccessInfo" bson:"addAccessInfo,omitempty"`
-	RelAccessInfo             *AdditionalAccessInfo                  `json:"relAccessInfo,omitempty" yaml:"relAccessInfo" bson:"relAccessInfo,omitempty"`
-	AnChargAddr               *AccNetChargingAddress                 `json:"anChargAddr,omitempty" yaml:"anChargAddr" bson:"anChargAddr,omitempty"`
-	AnChargIds                []AccessNetChargingIdentifier          `json:"anChargIds,omitempty" yaml:"anChargIds" bson:"anChargIds,omitempty"`
-	AnGwAddr                  *AnGwAddress                           `json:"anGwAddr,omitempty" yaml:"anGwAddr" bson:"anGwAddr,omitempty"`
-	EvSubsUri                 string                                 `json:"evSubsUri" yaml:"evSubsUri" bson:"evSubsUri,omitempty"`
-	EvNotifs                  []AfEventNotification                  `json:"evNotifs" yaml:"evNotifs" bson:"evNotifs,omitempty"`
-	FailedResourcAllocReports []ResourcesAllocationInfo              `json:"failedResourcAllocReports,omitempty" yaml:"failedResourcAllocReports" bson:"failedResourcAllocReports,omitempty"`
-	SuccResourcAllocReports   []ResourcesAllocationInfo              `json:"succResourcAllocReports,omitempty" yaml:"succResourcAllocReports" bson:"succResourcAllocReports,omitempty"`
-	NoNetLocSupp              NetLocAccessSupport                    `json:"noNetLocSupp,omitempty" yaml:"noNetLocSupp" bson:"noNetLocSupp,omitempty"`
-	OutOfCredReports          []OutOfCreditInformation               `json:"outOfCredReports,omitempty" yaml:"outOfCredReports" bson:"outOfCredReports,omitempty"`
-	PlmnId                    *PlmnIdNid                             `json:"plmnId,omitempty" yaml:"plmnId" bson:"plmnId,omitempty"`
-	QncReports                []PolicyAuthQosNotificationControlInfo `json:"qncReports,omitempty" yaml:"qncReports" bson:"qncReports,omitempty"`
-	QosMonReports             []QosMonitoringReport                  `json:"qosMonReports,omitempty" yaml:"qosMonReports" bson:"qosMonReports,omitempty"`
-	// Contains the RAN and/or NAS release cause.
-	RanNasRelCauses     []RanNasRelCause           `json:"ranNasRelCauses,omitempty" yaml:"ranNasRelCauses" bson:"ranNasRelCauses,omitempty"`
-	RatType             RatType                    `json:"ratType,omitempty" yaml:"ratType" bson:"ratType,omitempty"`
-	UeLoc               *UserLocation              `json:"ueLoc,omitempty" yaml:"ueLoc" bson:"ueLoc,omitempty"`
-	UeLocTime           *time.Time                 `json:"ueLocTime,omitempty" yaml:"ueLocTime" bson:"ueLocTime,omitempty"`
-	UeTimeZone          string                     `json:"ueTimeZone,omitempty" yaml:"ueTimeZone" bson:"ueTimeZone,omitempty"`
-	UsgRep              *AccumulatedUsage          `json:"usgRep,omitempty" yaml:"usgRep" bson:"usgRep,omitempty"`
-	TsnBridgeManCont    *BridgeManagementContainer `json:"tsnBridgeManCont,omitempty" yaml:"tsnBridgeManCont" bson:"tsnBridgeManCont,omitempty"`
-	TsnPortManContDstt  *PortManagementContainer   `json:"tsnPortManContDstt,omitempty" yaml:"tsnPortManContDstt" bson:"tsnPortManContDstt,omitempty"`
-	TsnPortManContNwtts []PortManagementContainer  `json:"tsnPortManContNwtts,omitempty" yaml:"tsnPortManContNwtts" bson:"tsnPortManContNwtts,omitempty"`
-}
diff --git a/models/model_events_subsc_req_data.go b/models/model_events_subsc_req_data.go
deleted file mode 100644
index 94bbab0f..00000000
--- a/models/model_events_subsc_req_data.go
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Npcf_PolicyAuthorization Service API
- *
- * PCF Policy Authorization Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.514 V16.10.0; 5G System; Policy Authorization Service;Stage 3.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.514/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-// Identifies the events the application subscribes to.
-type EventsSubscReqData struct {
-	Events          []AfEventSubscription             `json:"events" yaml:"events" bson:"events,omitempty"`
-	NotifUri        string                            `json:"notifUri,omitempty" yaml:"notifUri" bson:"notifUri,omitempty"`
-	ReqQosMonParams []RequestedQosMonitoringParameter `json:"reqQosMonParams,omitempty" yaml:"reqQosMonParams" bson:"reqQosMonParams,omitempty"`
-	QosMon          *QosMonitoringInformation         `json:"qosMon,omitempty" yaml:"qosMon" bson:"qosMon,omitempty"`
-	ReqAnis         []RequiredAccessInfo              `json:"reqAnis,omitempty" yaml:"reqAnis" bson:"reqAnis,omitempty"`
-	UsgThres        *UsageThreshold                   `json:"usgThres,omitempty" yaml:"usgThres" bson:"usgThres,omitempty"`
-	NotifCorreId    string                            `json:"notifCorreId,omitempty" yaml:"notifCorreId" bson:"notifCorreId,omitempty"`
-}
diff --git a/models/model_events_subsc_req_data_rm.go b/models/model_events_subsc_req_data_rm.go
deleted file mode 100644
index 11346016..00000000
--- a/models/model_events_subsc_req_data_rm.go
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Npcf_PolicyAuthorization Service API
- *
- * PCF Policy Authorization Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.514 V16.10.0; 5G System; Policy Authorization Service;Stage 3.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.514/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-// this data type is defined in the same way as the EventsSubscReqData data type, but with the OpenAPI nullable property set to true.
-type EventsSubscReqDataRm struct {
-	Events          []AfEventSubscription             `json:"events" yaml:"events" bson:"events,omitempty"`
-	NotifUri        string                            `json:"notifUri,omitempty" yaml:"notifUri" bson:"notifUri,omitempty"`
-	ReqQosMonParams []RequestedQosMonitoringParameter `json:"reqQosMonParams,omitempty" yaml:"reqQosMonParams" bson:"reqQosMonParams,omitempty"`
-	QosMon          *QosMonitoringInformationRm       `json:"qosMon,omitempty" yaml:"qosMon" bson:"qosMon,omitempty"`
-	ReqAnis         []RequiredAccessInfo              `json:"reqAnis,omitempty" yaml:"reqAnis" bson:"reqAnis,omitempty"`
-	UsgThres        *UsageThresholdRm                 `json:"usgThres,omitempty" yaml:"usgThres" bson:"usgThres,omitempty"`
-	NotifCorreId    string                            `json:"notifCorreId,omitempty" yaml:"notifCorreId" bson:"notifCorreId,omitempty"`
-}
diff --git a/models/model_ext_problem_details.go b/models/model_ext_problem_details.go
deleted file mode 100644
index 9a2709f7..00000000
--- a/models/model_ext_problem_details.go
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Nsmf_PDUSession
- *
- * SMF PDU Session Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.502 V16.9.0; 5G System; Session Management Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.502/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type ExtProblemDetails struct {
-	Type               string          `json:"type,omitempty" yaml:"type" bson:"type,omitempty"`
-	Title              string          `json:"title,omitempty" yaml:"title" bson:"title,omitempty"`
-	Status             int32           `json:"status,omitempty" yaml:"status" bson:"status,omitempty"`
-	Detail             string          `json:"detail,omitempty" yaml:"detail" bson:"detail,omitempty"`
-	Instance           string          `json:"instance,omitempty" yaml:"instance" bson:"instance,omitempty"`
-	Cause              string          `json:"cause,omitempty" yaml:"cause" bson:"cause,omitempty"`
-	InvalidParams      []InvalidParam  `json:"invalidParams,omitempty" yaml:"invalidParams" bson:"invalidParams,omitempty"`
-	SupportedFeatures  string          `json:"supportedFeatures,omitempty" yaml:"supportedFeatures" bson:"supportedFeatures,omitempty"`
-	AccessTokenError   *AccessTokenErr `json:"accessTokenError,omitempty" yaml:"accessTokenError" bson:"accessTokenError,omitempty"`
-	AccessTokenRequest *AccessTokenReq `json:"accessTokenRequest,omitempty" yaml:"accessTokenRequest" bson:"accessTokenRequest,omitempty"`
-	NrfId              string          `json:"nrfId,omitempty" yaml:"nrfId" bson:"nrfId,omitempty"`
-	RemoteError        bool            `json:"remoteError,omitempty" yaml:"remoteError" bson:"remoteError,omitempty"`
-}
diff --git a/models/model_extended_problem_details.go b/models/model_extended_problem_details.go
deleted file mode 100644
index 883fc75f..00000000
--- a/models/model_extended_problem_details.go
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Npcf_PolicyAuthorization Service API
- *
- * PCF Policy Authorization Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.514 V16.10.0; 5G System; Policy Authorization Service;Stage 3.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.514/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-// Extends ProblemDetails to also include the acceptable service info.
-type ExtendedProblemDetails struct {
-	Type               string                 `json:"type,omitempty" yaml:"type" bson:"type,omitempty"`
-	Title              string                 `json:"title,omitempty" yaml:"title" bson:"title,omitempty"`
-	Status             int32                  `json:"status,omitempty" yaml:"status" bson:"status,omitempty"`
-	Detail             string                 `json:"detail,omitempty" yaml:"detail" bson:"detail,omitempty"`
-	Instance           string                 `json:"instance,omitempty" yaml:"instance" bson:"instance,omitempty"`
-	Cause              string                 `json:"cause,omitempty" yaml:"cause" bson:"cause,omitempty"`
-	InvalidParams      []InvalidParam         `json:"invalidParams,omitempty" yaml:"invalidParams" bson:"invalidParams,omitempty"`
-	SupportedFeatures  string                 `json:"supportedFeatures,omitempty" yaml:"supportedFeatures" bson:"supportedFeatures,omitempty"`
-	AccessTokenError   *AccessTokenErr        `json:"accessTokenError,omitempty" yaml:"accessTokenError" bson:"accessTokenError,omitempty"`
-	AccessTokenRequest *AccessTokenReq        `json:"accessTokenRequest,omitempty" yaml:"accessTokenRequest" bson:"accessTokenRequest,omitempty"`
-	NrfId              string                 `json:"nrfId,omitempty" yaml:"nrfId" bson:"nrfId,omitempty"`
-	AcceptableServInfo *AcceptableServiceInfo `json:"acceptableServInfo,omitempty" yaml:"acceptableServInfo" bson:"acceptableServInfo,omitempty"`
-}
diff --git a/models/model_failure_cause.go b/models/model_failure_cause.go
deleted file mode 100644
index fd7a9aa6..00000000
--- a/models/model_failure_cause.go
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Npcf_SMPolicyControl API
- *
- * Session Management Policy Control Service © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.512 V16.10.0; 5G System; Session Management Policy Control Service.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.512/
- *
- * API version: 1.1.6
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type FailureCause string
-
-// List of FailureCause
-const (
-	FailureCause_PCC_RULE_EVENT       FailureCause = "PCC_RULE_EVENT"
-	FailureCause_PCC_QOS_FLOW_EVENT   FailureCause = "PCC_QOS_FLOW_EVENT"
-	FailureCause_RULE_PERMANENT_ERROR FailureCause = "RULE_PERMANENT_ERROR"
-	FailureCause_RULE_TEMPORARY_ERROR FailureCause = "RULE_TEMPORARY_ERROR"
-	FailureCause_POL_DEC_ERROR        FailureCause = "POL_DEC_ERROR"
-)
diff --git a/models/model_failure_code.go b/models/model_failure_code.go
deleted file mode 100644
index a9be9503..00000000
--- a/models/model_failure_code.go
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Npcf_SMPolicyControl API
- *
- * Session Management Policy Control Service © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.512 V16.10.0; 5G System; Session Management Policy Control Service.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.512/
- *
- * API version: 1.1.6
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type FailureCode string
-
-// List of FailureCode
-const (
-	FailureCode_UNK_RULE_ID            FailureCode = "UNK_RULE_ID"
-	FailureCode_RA_GR_ERR              FailureCode = "RA_GR_ERR"
-	FailureCode_SER_ID_ERR             FailureCode = "SER_ID_ERR"
-	FailureCode_NF_MAL                 FailureCode = "NF_MAL"
-	FailureCode_RES_LIM                FailureCode = "RES_LIM"
-	FailureCode_MAX_NR_QO_S_FLOW       FailureCode = "MAX_NR_QoS_FLOW"
-	FailureCode_MISS_FLOW_INFO         FailureCode = "MISS_FLOW_INFO"
-	FailureCode_RES_ALLO_FAIL          FailureCode = "RES_ALLO_FAIL"
-	FailureCode_UNSUCC_QOS_VAL         FailureCode = "UNSUCC_QOS_VAL"
-	FailureCode_INCOR_FLOW_INFO        FailureCode = "INCOR_FLOW_INFO"
-	FailureCode_PS_TO_CS_HAN           FailureCode = "PS_TO_CS_HAN"
-	FailureCode_APP_ID_ERR             FailureCode = "APP_ID_ERR"
-	FailureCode_NO_QOS_FLOW_BOUND      FailureCode = "NO_QOS_FLOW_BOUND"
-	FailureCode_FILTER_RES             FailureCode = "FILTER_RES"
-	FailureCode_MISS_REDI_SER_ADDR     FailureCode = "MISS_REDI_SER_ADDR"
-	FailureCode_CM_END_USER_SER_DENIED FailureCode = "CM_END_USER_SER_DENIED"
-	FailureCode_CM_CREDIT_CON_NOT_APP  FailureCode = "CM_CREDIT_CON_NOT_APP" // #nosec G101
-	FailureCode_CM_AUTH_REJ            FailureCode = "CM_AUTH_REJ"
-	FailureCode_CM_USER_UNK            FailureCode = "CM_USER_UNK"
-	FailureCode_CM_RAT_FAILED          FailureCode = "CM_RAT_FAILED"
-	FailureCode_UE_STA_SUSP            FailureCode = "UE_STA_SUSP"
-)
diff --git a/models/model_gbr_qos_flow_information.go b/models/model_gbr_qos_flow_information.go
deleted file mode 100644
index 820afc30..00000000
--- a/models/model_gbr_qos_flow_information.go
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Nsmf_PDUSession
- *
- * SMF PDU Session Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.502 V16.9.0; 5G System; Session Management Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.502/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type GbrQosFlowInformation struct {
-	MaxFbrDl                  string                  `json:"maxFbrDl" yaml:"maxFbrDl" bson:"maxFbrDl,omitempty"`
-	MaxFbrUl                  string                  `json:"maxFbrUl" yaml:"maxFbrUl" bson:"maxFbrUl,omitempty"`
-	GuaFbrDl                  string                  `json:"guaFbrDl" yaml:"guaFbrDl" bson:"guaFbrDl,omitempty"`
-	GuaFbrUl                  string                  `json:"guaFbrUl" yaml:"guaFbrUl" bson:"guaFbrUl,omitempty"`
-	NotifControl              NotificationControl     `json:"notifControl,omitempty" yaml:"notifControl" bson:"notifControl,omitempty"`
-	MaxPacketLossRateDl       int32                   `json:"maxPacketLossRateDl,omitempty" yaml:"maxPacketLossRateDl" bson:"maxPacketLossRateDl,omitempty"`
-	MaxPacketLossRateUl       int32                   `json:"maxPacketLossRateUl,omitempty" yaml:"maxPacketLossRateUl" bson:"maxPacketLossRateUl,omitempty"`
-	AlternativeQosProfileList []AlternativeQosProfile `json:"alternativeQosProfileList,omitempty" yaml:"alternativeQosProfileList" bson:"alternativeQosProfileList,omitempty"`
-}
diff --git a/models/model_invalid_param_1.go b/models/model_invalid_param_1.go
deleted file mode 100644
index ea1351e8..00000000
--- a/models/model_invalid_param_1.go
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Nudr_DataRepository API OpenAPI file
- *
- * Unified Data Repository Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.504 V16.9.0; 5G System; Unified Data Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.504/
- *
- * API version: 2.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type InvalidParam1 struct {
-	// Attribute's name encoded as a JSON Pointer, or header's name.
-	Param string `json:"param" yaml:"param" bson:"param,omitempty"`
-	// A human-readable reason, e.g. \"must be a positive integer\".
-	Reason string `json:"reason,omitempty" yaml:"reason" bson:"reason,omitempty"`
-}
diff --git a/models/model_ip_address.go b/models/model_ip_address.go
deleted file mode 100644
index 0d6cacff..00000000
--- a/models/model_ip_address.go
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Nudr_DataRepository API OpenAPI file
- *
- * Unified Data Repository Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.504 V16.9.0; 5G System; Unified Data Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.504/
- *
- * API version: 2.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type IpAddress struct {
-	Ipv4Addr   string `json:"ipv4Addr,omitempty" yaml:"ipv4Addr" bson:"ipv4Addr,omitempty"`
-	Ipv6Addr   string `json:"ipv6Addr,omitempty" yaml:"ipv6Addr" bson:"ipv6Addr,omitempty"`
-	Ipv6Prefix string `json:"ipv6Prefix,omitempty" yaml:"ipv6Prefix" bson:"ipv6Prefix,omitempty"`
-}
diff --git a/models/model_ipv4_address_range.go b/models/model_ipv4_address_range.go
deleted file mode 100644
index 51d1c85e..00000000
--- a/models/model_ipv4_address_range.go
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * NRF NFManagement Service
- *
- * NRF NFManagement Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.510 V16.9.0; 5G System; Network Function Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.510/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-// Range of IPv4 addresses
-type Ipv4AddressRange struct {
-	Start string `json:"start,omitempty" yaml:"start" bson:"start,omitempty"`
-	End   string `json:"end,omitempty" yaml:"end" bson:"end,omitempty"`
-}
diff --git a/models/model_ipv6_prefix_range.go b/models/model_ipv6_prefix_range.go
deleted file mode 100644
index 3864faa4..00000000
--- a/models/model_ipv6_prefix_range.go
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * NRF NFManagement Service
- *
- * NRF NFManagement Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.510 V16.9.0; 5G System; Network Function Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.510/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-// Range of IPv6 prefixes
-type Ipv6PrefixRange struct {
-	Start string `json:"start,omitempty" yaml:"start" bson:"start,omitempty"`
-	End   string `json:"end,omitempty" yaml:"end" bson:"end,omitempty"`
-}
diff --git a/models/model_location_accuracy.go b/models/model_location_accuracy.go
deleted file mode 100644
index df447b2e..00000000
--- a/models/model_location_accuracy.go
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Nudr_DataRepository API OpenAPI file
- *
- * Unified Data Repository Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.504 V16.9.0; 5G System; Unified Data Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.504/
- *
- * API version: 2.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type LocationAccuracy string
-
-// List of LocationAccuracy
-const (
-	LocationAccuracy_CELL_LEVEL   LocationAccuracy = "CELL_LEVEL"
-	LocationAccuracy_TA_LEVEL     LocationAccuracy = "TA_LEVEL"
-	LocationAccuracy_N3_IWF_LEVEL LocationAccuracy = "N3IWF_LEVEL"
-	LocationAccuracy_UE_IP        LocationAccuracy = "UE_IP"
-	LocationAccuracy_UE_PORT      LocationAccuracy = "UE_PORT"
-)
diff --git a/models/model_location_area.go b/models/model_location_area.go
deleted file mode 100644
index 7614eb75..00000000
--- a/models/model_location_area.go
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Nudr_DataRepository API OpenAPI file
- *
- * Unified Data Repository Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.504 V16.9.0; 5G System; Unified Data Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.504/
- *
- * API version: 2.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type LocationArea struct {
-	// Identifies a list of geographic area of the user where the UE is located.
-	GeographicAreas []GeographicArea `json:"geographicAreas,omitempty" yaml:"geographicAreas" bson:"geographicAreas,omitempty"`
-	// Identifies a list of civic addresses of the user where the UE is located.
-	CivicAddresses []CivicAddress   `json:"civicAddresses,omitempty" yaml:"civicAddresses" bson:"civicAddresses,omitempty"`
-	NwAreaInfo     *NetworkAreaInfo `json:"nwAreaInfo,omitempty" yaml:"nwAreaInfo" bson:"nwAreaInfo,omitempty"`
-}
diff --git a/models/model_location_reporting_configuration.go b/models/model_location_reporting_configuration.go
deleted file mode 100644
index f81b91be..00000000
--- a/models/model_location_reporting_configuration.go
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Nudr_DataRepository API OpenAPI file
- *
- * Unified Data Repository Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.504 V16.9.0; 5G System; Unified Data Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.504/
- *
- * API version: 2.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type LocationReportingConfiguration struct {
-	CurrentLocation bool             `json:"currentLocation" yaml:"currentLocation" bson:"currentLocation,omitempty"`
-	OneTime         bool             `json:"oneTime,omitempty" yaml:"oneTime" bson:"oneTime,omitempty"`
-	Accuracy        LocationAccuracy `json:"accuracy,omitempty" yaml:"accuracy" bson:"accuracy,omitempty"`
-	N3gppAccuracy   LocationAccuracy `json:"n3gppAccuracy,omitempty" yaml:"n3gppAccuracy" bson:"n3gppAccuracy,omitempty"`
-}
diff --git a/models/model_monitoring_configuration.go b/models/model_monitoring_configuration.go
deleted file mode 100644
index 0bf2d6ff..00000000
--- a/models/model_monitoring_configuration.go
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Nudr_DataRepository API OpenAPI file
- *
- * Unified Data Repository Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.504 V16.9.0; 5G System; Unified Data Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.504/
- *
- * API version: 2.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type MonitoringConfiguration struct {
-	EventType                      EventType                       `json:"eventType" yaml:"eventType" bson:"eventType,omitempty"`
-	ImmediateFlag                  bool                            `json:"immediateFlag,omitempty" yaml:"immediateFlag" bson:"immediateFlag,omitempty"`
-	LocationReportingConfiguration *LocationReportingConfiguration `json:"locationReportingConfiguration,omitempty" yaml:"locationReportingConfiguration" bson:"locationReportingConfiguration,omitempty"`
-	AssociationType                AssociationType                 `json:"associationType,omitempty" yaml:"associationType" bson:"associationType,omitempty"`
-	DatalinkReportCfg              *DatalinkReportingConfiguration `json:"datalinkReportCfg,omitempty" yaml:"datalinkReportCfg" bson:"datalinkReportCfg,omitempty"`
-	LossConnectivityCfg            *LossConnectivityCfg            `json:"lossConnectivityCfg,omitempty" yaml:"lossConnectivityCfg" bson:"lossConnectivityCfg,omitempty"`
-	MaximumLatency                 int32                           `json:"maximumLatency,omitempty" yaml:"maximumLatency" bson:"maximumLatency,omitempty"`
-	MaximumResponseTime            int32                           `json:"maximumResponseTime,omitempty" yaml:"maximumResponseTime" bson:"maximumResponseTime,omitempty"`
-	SuggestedPacketNumDl           int32                           `json:"suggestedPacketNumDl,omitempty" yaml:"suggestedPacketNumDl" bson:"suggestedPacketNumDl,omitempty"`
-	PduSessionStatusCfg            *PduSessionStatusCfg            `json:"pduSessionStatusCfg,omitempty" yaml:"pduSessionStatusCfg" bson:"pduSessionStatusCfg,omitempty"`
-	ReachabilityForSmsCfg          ReachabilityForSmsConfiguration `json:"reachabilityForSmsCfg,omitempty" yaml:"reachabilityForSmsCfg" bson:"reachabilityForSmsCfg,omitempty"`
-	MtcProviderInformation         string                          `json:"mtcProviderInformation,omitempty" yaml:"mtcProviderInformation" bson:"mtcProviderInformation,omitempty"`
-	AfId                           string                          `json:"afId,omitempty" yaml:"afId" bson:"afId,omitempty"`
-}
diff --git a/models/model_nf_management_subscription_data.go b/models/model_nf_management_subscription_data.go
deleted file mode 100644
index 5ccbec4a..00000000
--- a/models/model_nf_management_subscription_data.go
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * NRF NFManagement Service
- *
- * NRF NFManagement Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.510 V16.9.0; 5G System; Network Function Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.510/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-import (
-	"time"
-)
-
-// Information of a subscription to notifications to NRF events, included in subscription requests and responses
-type NfManagementSubscriptionData struct {
-	NfStatusNotificationUri string                  `json:"nfStatusNotificationUri" yaml:"nfStatusNotificationUri" bson:"nfStatusNotificationUri,omitempty"`
-	ReqNfInstanceId         string                  `json:"reqNfInstanceId,omitempty" yaml:"reqNfInstanceId" bson:"reqNfInstanceId,omitempty"`
-	SubscrCond              interface{}             `json:"subscrCond,omitempty" yaml:"subscrCond" bson:"subscrCond,omitempty"`
-	SubscriptionId          string                  `json:"subscriptionId" yaml:"subscriptionId" bson:"subscriptionId,omitempty"`
-	ValidityTime            *time.Time              `json:"validityTime,omitempty" yaml:"validityTime" bson:"validityTime,omitempty"`
-	ReqNotifEvents          []NotificationEventType `json:"reqNotifEvents,omitempty" yaml:"reqNotifEvents" bson:"reqNotifEvents,omitempty"`
-	PlmnId                  *PlmnId                 `json:"plmnId,omitempty" yaml:"plmnId" bson:"plmnId,omitempty"`
-	Nid                     string                  `json:"nid,omitempty" yaml:"nid" bson:"nid,omitempty"`
-	NotifCondition          *NotifCondition         `json:"notifCondition,omitempty" yaml:"notifCondition" bson:"notifCondition,omitempty"`
-	ReqNfType               NfType                  `json:"reqNfType,omitempty" yaml:"reqNfType" bson:"reqNfType,omitempty"`
-	// Fully Qualified Domain Name
-	ReqNfFqdn            string       `json:"reqNfFqdn,omitempty" yaml:"reqNfFqdn" bson:"reqNfFqdn,omitempty"`
-	ReqSnssais           []Snssai     `json:"reqSnssais,omitempty" yaml:"reqSnssais" bson:"reqSnssais,omitempty"`
-	ReqPerPlmnSnssais    []PlmnSnssai `json:"reqPerPlmnSnssais,omitempty" yaml:"reqPerPlmnSnssais" bson:"reqPerPlmnSnssais,omitempty"`
-	ReqPlmnList          []PlmnId     `json:"reqPlmnList,omitempty" yaml:"reqPlmnList" bson:"reqPlmnList,omitempty"`
-	ReqSnpnList          []PlmnIdNid  `json:"reqSnpnList,omitempty" yaml:"reqSnpnList" bson:"reqSnpnList,omitempty"`
-	ServingScope         []string     `json:"servingScope,omitempty" yaml:"servingScope" bson:"servingScope,omitempty"`
-	RequesterFeatures    string       `json:"requesterFeatures,omitempty" yaml:"requesterFeatures" bson:"requesterFeatures,omitempty"`
-	NrfSupportedFeatures string       `json:"nrfSupportedFeatures,omitempty" yaml:"nrfSupportedFeatures" bson:"nrfSupportedFeatures,omitempty"`
-}
diff --git a/models/model_nf_profile.go b/models/model_nf_profile.go
deleted file mode 100644
index a061a5c9..00000000
--- a/models/model_nf_profile.go
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * NRF NFManagement Service
- *
- * NRF NFManagement Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.510 V16.9.0; 5G System; Network Function Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.510/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-import (
-	"time"
-)
-
-// Information of an NF Instance registered in the NRF
-type NfProfile struct {
-	NfInstanceId      string       `json:"nfInstanceId" yaml:"nfInstanceId" bson:"nfInstanceId,omitempty"`
-	NfInstanceName    string       `json:"nfInstanceName,omitempty" yaml:"nfInstanceName" bson:"nfInstanceName,omitempty"`
-	NfType            NfType       `json:"nfType" yaml:"nfType" bson:"nfType,omitempty"`
-	NfStatus          NfStatus     `json:"nfStatus" yaml:"nfStatus" bson:"nfStatus,omitempty"`
-	HeartBeatTimer    int32        `json:"heartBeatTimer,omitempty" yaml:"heartBeatTimer" bson:"heartBeatTimer,omitempty"`
-	PlmnList          []PlmnId     `json:"plmnList,omitempty" yaml:"plmnList" bson:"plmnList,omitempty"`
-	SnpnList          []PlmnIdNid  `json:"snpnList,omitempty" yaml:"snpnList" bson:"snpnList,omitempty"`
-	SNssais           []ExtSnssai  `json:"sNssais,omitempty" yaml:"sNssais" bson:"sNssais,omitempty"`
-	PerPlmnSnssaiList []PlmnSnssai `json:"perPlmnSnssaiList,omitempty" yaml:"perPlmnSnssaiList" bson:"perPlmnSnssaiList,omitempty"`
-	NsiList           []string     `json:"nsiList,omitempty" yaml:"nsiList" bson:"nsiList,omitempty"`
-	// Fully Qualified Domain Name
-	Fqdn string `json:"fqdn,omitempty" yaml:"fqdn" bson:"fqdn,omitempty"`
-	// Fully Qualified Domain Name
-	InterPlmnFqdn                    string                            `json:"interPlmnFqdn,omitempty" yaml:"interPlmnFqdn" bson:"interPlmnFqdn,omitempty"`
-	Ipv4Addresses                    []string                          `json:"ipv4Addresses,omitempty" yaml:"ipv4Addresses" bson:"ipv4Addresses,omitempty"`
-	Ipv6Addresses                    []string                          `json:"ipv6Addresses,omitempty" yaml:"ipv6Addresses" bson:"ipv6Addresses,omitempty"`
-	AllowedPlmns                     []PlmnId                          `json:"allowedPlmns,omitempty" yaml:"allowedPlmns" bson:"allowedPlmns,omitempty"`
-	AllowedSnpns                     []PlmnIdNid                       `json:"allowedSnpns,omitempty" yaml:"allowedSnpns" bson:"allowedSnpns,omitempty"`
-	AllowedNfTypes                   []NfType                          `json:"allowedNfTypes,omitempty" yaml:"allowedNfTypes" bson:"allowedNfTypes,omitempty"`
-	AllowedNfDomains                 []string                          `json:"allowedNfDomains,omitempty" yaml:"allowedNfDomains" bson:"allowedNfDomains,omitempty"`
-	AllowedNssais                    []ExtSnssai                       `json:"allowedNssais,omitempty" yaml:"allowedNssais" bson:"allowedNssais,omitempty"`
-	Priority                         int32                             `json:"priority,omitempty" yaml:"priority" bson:"priority,omitempty"`
-	Capacity                         int32                             `json:"capacity,omitempty" yaml:"capacity" bson:"capacity,omitempty"`
-	Load                             int32                             `json:"load,omitempty" yaml:"load" bson:"load,omitempty"`
-	LoadTimeStamp                    *time.Time                        `json:"loadTimeStamp,omitempty" yaml:"loadTimeStamp" bson:"loadTimeStamp,omitempty"`
-	Locality                         string                            `json:"locality,omitempty" yaml:"locality" bson:"locality,omitempty"`
-	UdrInfo                          *UdrInfo                          `json:"udrInfo,omitempty" yaml:"udrInfo" bson:"udrInfo,omitempty"`
-	UdrInfoList                      map[string]UdrInfo                `json:"udrInfoList,omitempty" yaml:"udrInfoList" bson:"udrInfoList,omitempty"`
-	UdmInfo                          *UdmInfo                          `json:"udmInfo,omitempty" yaml:"udmInfo" bson:"udmInfo,omitempty"`
-	UdmInfoList                      map[string]UdmInfo                `json:"udmInfoList,omitempty" yaml:"udmInfoList" bson:"udmInfoList,omitempty"`
-	AusfInfo                         *AusfInfo                         `json:"ausfInfo,omitempty" yaml:"ausfInfo" bson:"ausfInfo,omitempty"`
-	AusfInfoList                     map[string]AusfInfo               `json:"ausfInfoList,omitempty" yaml:"ausfInfoList" bson:"ausfInfoList,omitempty"`
-	AmfInfo                          *AmfInfo                          `json:"amfInfo,omitempty" yaml:"amfInfo" bson:"amfInfo,omitempty"`
-	AmfInfoList                      map[string]AmfInfo                `json:"amfInfoList,omitempty" yaml:"amfInfoList" bson:"amfInfoList,omitempty"`
-	SmfInfo                          *SmfInfo                          `json:"smfInfo,omitempty" yaml:"smfInfo" bson:"smfInfo,omitempty"`
-	SmfInfoList                      map[string]SmfInfo                `json:"smfInfoList,omitempty" yaml:"smfInfoList" bson:"smfInfoList,omitempty"`
-	UpfInfo                          *UpfInfo                          `json:"upfInfo,omitempty" yaml:"upfInfo" bson:"upfInfo,omitempty"`
-	UpfInfoList                      map[string]UpfInfo                `json:"upfInfoList,omitempty" yaml:"upfInfoList" bson:"upfInfoList,omitempty"`
-	PcfInfo                          *PcfInfo                          `json:"pcfInfo,omitempty" yaml:"pcfInfo" bson:"pcfInfo,omitempty"`
-	PcfInfoList                      map[string]PcfInfo                `json:"pcfInfoList,omitempty" yaml:"pcfInfoList" bson:"pcfInfoList,omitempty"`
-	BsfInfo                          *BsfInfo                          `json:"bsfInfo,omitempty" yaml:"bsfInfo" bson:"bsfInfo,omitempty"`
-	BsfInfoList                      map[string]BsfInfo                `json:"bsfInfoList,omitempty" yaml:"bsfInfoList" bson:"bsfInfoList,omitempty"`
-	ChfInfo                          *ChfInfo                          `json:"chfInfo,omitempty" yaml:"chfInfo" bson:"chfInfo,omitempty"`
-	ChfInfoList                      map[string]ChfInfo                `json:"chfInfoList,omitempty" yaml:"chfInfoList" bson:"chfInfoList,omitempty"`
-	NefInfo                          *NefInfo                          `json:"nefInfo,omitempty" yaml:"nefInfo" bson:"nefInfo,omitempty"`
-	NrfInfo                          *NrfInfo                          `json:"nrfInfo,omitempty" yaml:"nrfInfo" bson:"nrfInfo,omitempty"`
-	UdsfInfo                         *UdsfInfo                         `json:"udsfInfo,omitempty" yaml:"udsfInfo" bson:"udsfInfo,omitempty"`
-	UdsfInfoList                     map[string]UdsfInfo               `json:"udsfInfoList,omitempty" yaml:"udsfInfoList" bson:"udsfInfoList,omitempty"`
-	NwdafInfo                        *NwdafInfo                        `json:"nwdafInfo,omitempty" yaml:"nwdafInfo" bson:"nwdafInfo,omitempty"`
-	PcscfInfoList                    map[string]PcscfInfo              `json:"pcscfInfoList,omitempty" yaml:"pcscfInfoList" bson:"pcscfInfoList,omitempty"`
-	HssInfoList                      map[string]HssInfo                `json:"hssInfoList,omitempty" yaml:"hssInfoList" bson:"hssInfoList,omitempty"`
-	CustomInfo                       map[string]interface{}            `json:"customInfo,omitempty" yaml:"customInfo" bson:"customInfo,omitempty"`
-	RecoveryTime                     *time.Time                        `json:"recoveryTime,omitempty" yaml:"recoveryTime" bson:"recoveryTime,omitempty"`
-	NfServicePersistence             bool                              `json:"nfServicePersistence,omitempty" yaml:"nfServicePersistence" bson:"nfServicePersistence,omitempty"`
-	NfServices                       []NfService                       `json:"nfServices,omitempty" yaml:"nfServices" bson:"nfServices,omitempty"`
-	NfServiceList                    map[string]NfService              `json:"nfServiceList,omitempty" yaml:"nfServiceList" bson:"nfServiceList,omitempty"`
-	NfProfileChangesSupportInd       bool                              `json:"nfProfileChangesSupportInd,omitempty" yaml:"nfProfileChangesSupportInd" bson:"nfProfileChangesSupportInd,omitempty"`
-	NfProfileChangesInd              bool                              `json:"nfProfileChangesInd,omitempty" yaml:"nfProfileChangesInd" bson:"nfProfileChangesInd,omitempty"`
-	DefaultNotificationSubscriptions []DefaultNotificationSubscription `json:"defaultNotificationSubscriptions,omitempty" yaml:"defaultNotificationSubscriptions" bson:"defaultNotificationSubscriptions,omitempty"`
-	LmfInfo                          *LmfInfo                          `json:"lmfInfo,omitempty" yaml:"lmfInfo" bson:"lmfInfo,omitempty"`
-	GmlcInfo                         *GmlcInfo                         `json:"gmlcInfo,omitempty" yaml:"gmlcInfo" bson:"gmlcInfo,omitempty"`
-	NfSetIdList                      []string                          `json:"nfSetIdList,omitempty" yaml:"nfSetIdList" bson:"nfSetIdList,omitempty"`
-	ServingScope                     []string                          `json:"servingScope,omitempty" yaml:"servingScope" bson:"servingScope,omitempty"`
-	LcHSupportInd                    bool                              `json:"lcHSupportInd,omitempty" yaml:"lcHSupportInd" bson:"lcHSupportInd,omitempty"`
-	OlcHSupportInd                   bool                              `json:"olcHSupportInd,omitempty" yaml:"olcHSupportInd" bson:"olcHSupportInd,omitempty"`
-	NfSetRecoveryTimeList            map[string]time.Time              `json:"nfSetRecoveryTimeList,omitempty" yaml:"nfSetRecoveryTimeList" bson:"nfSetRecoveryTimeList,omitempty"`
-	ServiceSetRecoveryTimeList       map[string]time.Time              `json:"serviceSetRecoveryTimeList,omitempty" yaml:"serviceSetRecoveryTimeList" bson:"serviceSetRecoveryTimeList,omitempty"`
-	ScpDomains                       []string                          `json:"scpDomains,omitempty" yaml:"scpDomains" bson:"scpDomains,omitempty"`
-	ScpInfo                          *ScpInfo                          `json:"scpInfo,omitempty" yaml:"scpInfo" bson:"scpInfo,omitempty"`
-}
diff --git a/models/model_nf_profile_notification_data.go b/models/model_nf_profile_notification_data.go
deleted file mode 100644
index 9ee4bf1b..00000000
--- a/models/model_nf_profile_notification_data.go
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * NRF NFManagement Service
- *
- * NRF NFManagement Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.510 V16.9.0; 5G System; Network Function Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.510/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-import (
-	"time"
-)
-
-type NfProfileNotificationData struct {
-	NfInstanceId      string       `json:"nfInstanceId" yaml:"nfInstanceId" bson:"nfInstanceId,omitempty"`
-	NfInstanceName    string       `json:"nfInstanceName,omitempty" yaml:"nfInstanceName" bson:"nfInstanceName,omitempty"`
-	NfType            NfType       `json:"nfType" yaml:"nfType" bson:"nfType,omitempty"`
-	NfStatus          NfStatus     `json:"nfStatus" yaml:"nfStatus" bson:"nfStatus,omitempty"`
-	HeartBeatTimer    int32        `json:"heartBeatTimer,omitempty" yaml:"heartBeatTimer" bson:"heartBeatTimer,omitempty"`
-	PlmnList          []PlmnId     `json:"plmnList,omitempty" yaml:"plmnList" bson:"plmnList,omitempty"`
-	SnpnList          []PlmnIdNid  `json:"snpnList,omitempty" yaml:"snpnList" bson:"snpnList,omitempty"`
-	SNssais           []ExtSnssai  `json:"sNssais,omitempty" yaml:"sNssais" bson:"sNssais,omitempty"`
-	PerPlmnSnssaiList []PlmnSnssai `json:"perPlmnSnssaiList,omitempty" yaml:"perPlmnSnssaiList" bson:"perPlmnSnssaiList,omitempty"`
-	NsiList           []string     `json:"nsiList,omitempty" yaml:"nsiList" bson:"nsiList,omitempty"`
-	// Fully Qualified Domain Name
-	Fqdn string `json:"fqdn,omitempty" yaml:"fqdn" bson:"fqdn,omitempty"`
-	// Fully Qualified Domain Name
-	InterPlmnFqdn                    string                            `json:"interPlmnFqdn,omitempty" yaml:"interPlmnFqdn" bson:"interPlmnFqdn,omitempty"`
-	Ipv4Addresses                    []string                          `json:"ipv4Addresses,omitempty" yaml:"ipv4Addresses" bson:"ipv4Addresses,omitempty"`
-	Ipv6Addresses                    []string                          `json:"ipv6Addresses,omitempty" yaml:"ipv6Addresses" bson:"ipv6Addresses,omitempty"`
-	AllowedPlmns                     []PlmnId                          `json:"allowedPlmns,omitempty" yaml:"allowedPlmns" bson:"allowedPlmns,omitempty"`
-	AllowedSnpns                     []PlmnIdNid                       `json:"allowedSnpns,omitempty" yaml:"allowedSnpns" bson:"allowedSnpns,omitempty"`
-	AllowedNfTypes                   []NfType                          `json:"allowedNfTypes,omitempty" yaml:"allowedNfTypes" bson:"allowedNfTypes,omitempty"`
-	AllowedNfDomains                 []string                          `json:"allowedNfDomains,omitempty" yaml:"allowedNfDomains" bson:"allowedNfDomains,omitempty"`
-	AllowedNssais                    []ExtSnssai                       `json:"allowedNssais,omitempty" yaml:"allowedNssais" bson:"allowedNssais,omitempty"`
-	Priority                         int32                             `json:"priority,omitempty" yaml:"priority" bson:"priority,omitempty"`
-	Capacity                         int32                             `json:"capacity,omitempty" yaml:"capacity" bson:"capacity,omitempty"`
-	Load                             int32                             `json:"load,omitempty" yaml:"load" bson:"load,omitempty"`
-	LoadTimeStamp                    *time.Time                        `json:"loadTimeStamp,omitempty" yaml:"loadTimeStamp" bson:"loadTimeStamp,omitempty"`
-	Locality                         string                            `json:"locality,omitempty" yaml:"locality" bson:"locality,omitempty"`
-	UdrInfo                          *UdrInfo                          `json:"udrInfo,omitempty" yaml:"udrInfo" bson:"udrInfo,omitempty"`
-	UdrInfoList                      map[string]UdrInfo                `json:"udrInfoList,omitempty" yaml:"udrInfoList" bson:"udrInfoList,omitempty"`
-	UdmInfo                          *UdmInfo                          `json:"udmInfo,omitempty" yaml:"udmInfo" bson:"udmInfo,omitempty"`
-	UdmInfoList                      map[string]UdmInfo                `json:"udmInfoList,omitempty" yaml:"udmInfoList" bson:"udmInfoList,omitempty"`
-	AusfInfo                         *AusfInfo                         `json:"ausfInfo,omitempty" yaml:"ausfInfo" bson:"ausfInfo,omitempty"`
-	AusfInfoList                     map[string]AusfInfo               `json:"ausfInfoList,omitempty" yaml:"ausfInfoList" bson:"ausfInfoList,omitempty"`
-	AmfInfo                          *AmfInfo                          `json:"amfInfo,omitempty" yaml:"amfInfo" bson:"amfInfo,omitempty"`
-	AmfInfoList                      map[string]AmfInfo                `json:"amfInfoList,omitempty" yaml:"amfInfoList" bson:"amfInfoList,omitempty"`
-	SmfInfo                          *SmfInfo                          `json:"smfInfo,omitempty" yaml:"smfInfo" bson:"smfInfo,omitempty"`
-	SmfInfoList                      map[string]SmfInfo                `json:"smfInfoList,omitempty" yaml:"smfInfoList" bson:"smfInfoList,omitempty"`
-	UpfInfo                          *UpfInfo                          `json:"upfInfo,omitempty" yaml:"upfInfo" bson:"upfInfo,omitempty"`
-	UpfInfoList                      map[string]UpfInfo                `json:"upfInfoList,omitempty" yaml:"upfInfoList" bson:"upfInfoList,omitempty"`
-	PcfInfo                          *PcfInfo                          `json:"pcfInfo,omitempty" yaml:"pcfInfo" bson:"pcfInfo,omitempty"`
-	PcfInfoList                      map[string]PcfInfo                `json:"pcfInfoList,omitempty" yaml:"pcfInfoList" bson:"pcfInfoList,omitempty"`
-	BsfInfo                          *BsfInfo                          `json:"bsfInfo,omitempty" yaml:"bsfInfo" bson:"bsfInfo,omitempty"`
-	BsfInfoList                      map[string]BsfInfo                `json:"bsfInfoList,omitempty" yaml:"bsfInfoList" bson:"bsfInfoList,omitempty"`
-	ChfInfo                          *ChfInfo                          `json:"chfInfo,omitempty" yaml:"chfInfo" bson:"chfInfo,omitempty"`
-	ChfInfoList                      map[string]ChfInfo                `json:"chfInfoList,omitempty" yaml:"chfInfoList" bson:"chfInfoList,omitempty"`
-	NefInfo                          *NefInfo                          `json:"nefInfo,omitempty" yaml:"nefInfo" bson:"nefInfo,omitempty"`
-	NrfInfo                          *NrfInfo                          `json:"nrfInfo,omitempty" yaml:"nrfInfo" bson:"nrfInfo,omitempty"`
-	UdsfInfo                         *UdsfInfo                         `json:"udsfInfo,omitempty" yaml:"udsfInfo" bson:"udsfInfo,omitempty"`
-	UdsfInfoList                     map[string]UdsfInfo               `json:"udsfInfoList,omitempty" yaml:"udsfInfoList" bson:"udsfInfoList,omitempty"`
-	NwdafInfo                        *NwdafInfo                        `json:"nwdafInfo,omitempty" yaml:"nwdafInfo" bson:"nwdafInfo,omitempty"`
-	PcscfInfoList                    map[string]PcscfInfo              `json:"pcscfInfoList,omitempty" yaml:"pcscfInfoList" bson:"pcscfInfoList,omitempty"`
-	HssInfoList                      map[string]HssInfo                `json:"hssInfoList,omitempty" yaml:"hssInfoList" bson:"hssInfoList,omitempty"`
-	CustomInfo                       map[string]interface{}            `json:"customInfo,omitempty" yaml:"customInfo" bson:"customInfo,omitempty"`
-	RecoveryTime                     *time.Time                        `json:"recoveryTime,omitempty" yaml:"recoveryTime" bson:"recoveryTime,omitempty"`
-	NfServicePersistence             bool                              `json:"nfServicePersistence,omitempty" yaml:"nfServicePersistence" bson:"nfServicePersistence,omitempty"`
-	NfServices                       []NfService                       `json:"nfServices,omitempty" yaml:"nfServices" bson:"nfServices,omitempty"`
-	NfServiceList                    map[string]NfService              `json:"nfServiceList,omitempty" yaml:"nfServiceList" bson:"nfServiceList,omitempty"`
-	NfProfileChangesSupportInd       bool                              `json:"nfProfileChangesSupportInd,omitempty" yaml:"nfProfileChangesSupportInd" bson:"nfProfileChangesSupportInd,omitempty"`
-	NfProfileChangesInd              bool                              `json:"nfProfileChangesInd,omitempty" yaml:"nfProfileChangesInd" bson:"nfProfileChangesInd,omitempty"`
-	DefaultNotificationSubscriptions []DefaultNotificationSubscription `json:"defaultNotificationSubscriptions,omitempty" yaml:"defaultNotificationSubscriptions" bson:"defaultNotificationSubscriptions,omitempty"`
-	LmfInfo                          *LmfInfo                          `json:"lmfInfo,omitempty" yaml:"lmfInfo" bson:"lmfInfo,omitempty"`
-	GmlcInfo                         *GmlcInfo                         `json:"gmlcInfo,omitempty" yaml:"gmlcInfo" bson:"gmlcInfo,omitempty"`
-	NfSetIdList                      []string                          `json:"nfSetIdList,omitempty" yaml:"nfSetIdList" bson:"nfSetIdList,omitempty"`
-	ServingScope                     []string                          `json:"servingScope,omitempty" yaml:"servingScope" bson:"servingScope,omitempty"`
-	LcHSupportInd                    bool                              `json:"lcHSupportInd,omitempty" yaml:"lcHSupportInd" bson:"lcHSupportInd,omitempty"`
-	OlcHSupportInd                   bool                              `json:"olcHSupportInd,omitempty" yaml:"olcHSupportInd" bson:"olcHSupportInd,omitempty"`
-	NfSetRecoveryTimeList            map[string]time.Time              `json:"nfSetRecoveryTimeList,omitempty" yaml:"nfSetRecoveryTimeList" bson:"nfSetRecoveryTimeList,omitempty"`
-	ServiceSetRecoveryTimeList       map[string]time.Time              `json:"serviceSetRecoveryTimeList,omitempty" yaml:"serviceSetRecoveryTimeList" bson:"serviceSetRecoveryTimeList,omitempty"`
-	ScpDomains                       []string                          `json:"scpDomains,omitempty" yaml:"scpDomains" bson:"scpDomains,omitempty"`
-	ScpInfo                          *ScpInfo                          `json:"scpInfo,omitempty" yaml:"scpInfo" bson:"scpInfo,omitempty"`
-}
diff --git a/models/model_nf_service.go b/models/model_nf_service.go
deleted file mode 100644
index 5a27c9d3..00000000
--- a/models/model_nf_service.go
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * NRF NFManagement Service
- *
- * NRF NFManagement Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.510 V16.9.0; 5G System; Network Function Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.510/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-import (
-	"time"
-)
-
-// Information of a given NF Service Instance; it is part of the NFProfile of an NF Instance
-type NfService struct {
-	ServiceInstanceId string             `json:"serviceInstanceId" yaml:"serviceInstanceId" bson:"serviceInstanceId,omitempty"`
-	ServiceName       ServiceName        `json:"serviceName" yaml:"serviceName" bson:"serviceName,omitempty"`
-	Versions          []NfServiceVersion `json:"versions" yaml:"versions" bson:"versions,omitempty"`
-	Scheme            UriScheme          `json:"scheme" yaml:"scheme" bson:"scheme,omitempty"`
-	NfServiceStatus   NfServiceStatus    `json:"nfServiceStatus" yaml:"nfServiceStatus" bson:"nfServiceStatus,omitempty"`
-	// Fully Qualified Domain Name
-	Fqdn string `json:"fqdn,omitempty" yaml:"fqdn" bson:"fqdn,omitempty"`
-	// Fully Qualified Domain Name
-	InterPlmnFqdn                    string                            `json:"interPlmnFqdn,omitempty" yaml:"interPlmnFqdn" bson:"interPlmnFqdn,omitempty"`
-	IpEndPoints                      []IpEndPoint                      `json:"ipEndPoints,omitempty" yaml:"ipEndPoints" bson:"ipEndPoints,omitempty"`
-	ApiPrefix                        string                            `json:"apiPrefix,omitempty" yaml:"apiPrefix" bson:"apiPrefix,omitempty"`
-	DefaultNotificationSubscriptions []DefaultNotificationSubscription `json:"defaultNotificationSubscriptions,omitempty" yaml:"defaultNotificationSubscriptions" bson:"defaultNotificationSubscriptions,omitempty"`
-	AllowedPlmns                     []PlmnId                          `json:"allowedPlmns,omitempty" yaml:"allowedPlmns" bson:"allowedPlmns,omitempty"`
-	AllowedSnpns                     []PlmnIdNid                       `json:"allowedSnpns,omitempty" yaml:"allowedSnpns" bson:"allowedSnpns,omitempty"`
-	AllowedNfTypes                   []NfType                          `json:"allowedNfTypes,omitempty" yaml:"allowedNfTypes" bson:"allowedNfTypes,omitempty"`
-	AllowedNfDomains                 []string                          `json:"allowedNfDomains,omitempty" yaml:"allowedNfDomains" bson:"allowedNfDomains,omitempty"`
-	AllowedNssais                    []ExtSnssai                       `json:"allowedNssais,omitempty" yaml:"allowedNssais" bson:"allowedNssais,omitempty"`
-	AllowedOperationsPerNfType       map[string][]string               `json:"allowedOperationsPerNfType,omitempty" yaml:"allowedOperationsPerNfType" bson:"allowedOperationsPerNfType,omitempty"`
-	AllowedOperationsPerNfInstance   map[string][]string               `json:"allowedOperationsPerNfInstance,omitempty" yaml:"allowedOperationsPerNfInstance" bson:"allowedOperationsPerNfInstance,omitempty"`
-	Priority                         int32                             `json:"priority,omitempty" yaml:"priority" bson:"priority,omitempty"`
-	Capacity                         int32                             `json:"capacity,omitempty" yaml:"capacity" bson:"capacity,omitempty"`
-	Load                             int32                             `json:"load,omitempty" yaml:"load" bson:"load,omitempty"`
-	LoadTimeStamp                    *time.Time                        `json:"loadTimeStamp,omitempty" yaml:"loadTimeStamp" bson:"loadTimeStamp,omitempty"`
-	RecoveryTime                     *time.Time                        `json:"recoveryTime,omitempty" yaml:"recoveryTime" bson:"recoveryTime,omitempty"`
-	SupportedFeatures                string                            `json:"supportedFeatures,omitempty" yaml:"supportedFeatures" bson:"supportedFeatures,omitempty"`
-	NfServiceSetIdList               []string                          `json:"nfServiceSetIdList,omitempty" yaml:"nfServiceSetIdList" bson:"nfServiceSetIdList,omitempty"`
-	SNssais                          []ExtSnssai                       `json:"sNssais,omitempty" yaml:"sNssais" bson:"sNssais,omitempty"`
-	PerPlmnSnssaiList                []PlmnSnssai                      `json:"perPlmnSnssaiList,omitempty" yaml:"perPlmnSnssaiList" bson:"perPlmnSnssaiList,omitempty"`
-	// Vendor ID of the NF Service instance (Private Enterprise Number assigned by IANA)
-	VendorId                        string                             `json:"vendorId,omitempty" yaml:"vendorId" bson:"vendorId,omitempty"`
-	SupportedVendorSpecificFeatures map[string][]VendorSpecificFeature `json:"supportedVendorSpecificFeatures,omitempty" yaml:"supportedVendorSpecificFeatures" bson:"supportedVendorSpecificFeatures,omitempty"`
-	Oauth2Required                  bool                               `json:"oauth2Required,omitempty" yaml:"oauth2Required" bson:"oauth2Required,omitempty"`
-}
diff --git a/models/model_nf_status.go b/models/model_nf_status.go
deleted file mode 100644
index ecff006c..00000000
--- a/models/model_nf_status.go
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * NRF NFManagement Service
- *
- * NRF NFManagement Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.510 V16.9.0; 5G System; Network Function Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.510/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type NfStatus string
-
-// List of NFStatus
-const (
-	NfStatus_REGISTERED     NfStatus = "REGISTERED"
-	NfStatus_SUSPENDED      NfStatus = "SUSPENDED"
-	NfStatus_UNDISCOVERABLE NfStatus = "UNDISCOVERABLE"
-)
diff --git a/models/model_nf_type.go b/models/model_nf_type.go
deleted file mode 100644
index 3e7febc1..00000000
--- a/models/model_nf_type.go
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Nudr_DataRepository API OpenAPI file
- *
- * Unified Data Repository Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.504 V16.9.0; 5G System; Unified Data Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.504/
- *
- * API version: 2.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type NfType string
-
-// List of NFType
-const (
-	NfType_NRF      NfType = "NRF"
-	NfType_UDM      NfType = "UDM"
-	NfType_AMF      NfType = "AMF"
-	NfType_SMF      NfType = "SMF"
-	NfType_AUSF     NfType = "AUSF"
-	NfType_NEF      NfType = "NEF"
-	NfType_PCF      NfType = "PCF"
-	NfType_SMSF     NfType = "SMSF"
-	NfType_NSSF     NfType = "NSSF"
-	NfType_UDR      NfType = "UDR"
-	NfType_LMF      NfType = "LMF"
-	NfType_GMLC     NfType = "GMLC"
-	NfType__5_G_EIR NfType = "5G_EIR"
-	NfType_SEPP     NfType = "SEPP"
-	NfType_UPF      NfType = "UPF"
-	NfType_N3_IWF   NfType = "N3IWF"
-	NfType_AF       NfType = "AF"
-	NfType_UDSF     NfType = "UDSF"
-	NfType_BSF      NfType = "BSF"
-	NfType_CHF      NfType = "CHF"
-	NfType_NWDAF    NfType = "NWDAF"
-	NfType_PCSCF    NfType = "PCSCF"
-	NfType_CBCF     NfType = "CBCF"
-	NfType_HSS      NfType = "HSS"
-	NfType_UCMF     NfType = "UCMF"
-	NfType_SOR_AF   NfType = "SOR_AF"
-	NfType_SPAF     NfType = "SPAF"
-	NfType_MME      NfType = "MME"
-	NfType_SCSAS    NfType = "SCSAS"
-	NfType_SCEF     NfType = "SCEF"
-	NfType_SCP      NfType = "SCP"
-	NfType_NSSAAF   NfType = "NSSAAF"
-	NfType_ICSCF    NfType = "ICSCF"
-	NfType_SCSCF    NfType = "SCSCF"
-	NfType_DRA      NfType = "DRA"
-	NfType_IMS_AS   NfType = "IMS_AS"
-)
diff --git a/models/model_ngap_ie_type.go b/models/model_ngap_ie_type.go
deleted file mode 100644
index 5486fbcb..00000000
--- a/models/model_ngap_ie_type.go
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Npcf_UEPolicyControl
- *
- * UE Policy Control Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.525 V16.9.0; 5G System; UE Policy Control Service.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.525/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type NgapIeType string
-
-// List of NgapIeType
-const (
-	NgapIeType_PDU_RES_SETUP_REQ            NgapIeType = "PDU_RES_SETUP_REQ"
-	NgapIeType_PDU_RES_REL_CMD              NgapIeType = "PDU_RES_REL_CMD"
-	NgapIeType_PDU_RES_MOD_REQ              NgapIeType = "PDU_RES_MOD_REQ"
-	NgapIeType_HANDOVER_CMD                 NgapIeType = "HANDOVER_CMD"
-	NgapIeType_HANDOVER_REQUIRED            NgapIeType = "HANDOVER_REQUIRED"
-	NgapIeType_HANDOVER_PREP_FAIL           NgapIeType = "HANDOVER_PREP_FAIL"
-	NgapIeType_SRC_TO_TAR_CONTAINER         NgapIeType = "SRC_TO_TAR_CONTAINER"
-	NgapIeType_TAR_TO_SRC_CONTAINER         NgapIeType = "TAR_TO_SRC_CONTAINER"
-	NgapIeType_TAR_TO_SRC_FAIL_CONTAINER    NgapIeType = "TAR_TO_SRC_FAIL_CONTAINER"
-	NgapIeType_RAN_STATUS_TRANS_CONTAINER   NgapIeType = "RAN_STATUS_TRANS_CONTAINER"
-	NgapIeType_SON_CONFIG_TRANSFER          NgapIeType = "SON_CONFIG_TRANSFER"
-	NgapIeType_NRPPA_PDU                    NgapIeType = "NRPPA_PDU"
-	NgapIeType_UE_RADIO_CAPABILITY          NgapIeType = "UE_RADIO_CAPABILITY"
-	NgapIeType_RIM_INFO_TRANSFER            NgapIeType = "RIM_INFO_TRANSFER"
-	NgapIeType_SECONDARY_RAT_USAGE          NgapIeType = "SECONDARY_RAT_USAGE"
-	NgapIeType_PC5_QOS_PARA                 NgapIeType = "PC5_QOS_PARA"
-	NgapIeType_EARLY_STATUS_TRANS_CONTAINER NgapIeType = "EARLY_STATUS_TRANS_CONTAINER"
-)
diff --git a/models/model_nidd_information.go b/models/model_nidd_information.go
deleted file mode 100644
index 7959d5d5..00000000
--- a/models/model_nidd_information.go
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Nudr_DataRepository API OpenAPI file
- *
- * Unified Data Repository Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.504 V16.9.0; 5G System; Unified Data Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.504/
- *
- * API version: 2.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type NiddInformation struct {
-	AfId       string `json:"afId" yaml:"afId" bson:"afId,omitempty"`
-	Gpsi       string `json:"gpsi,omitempty" yaml:"gpsi" bson:"gpsi,omitempty"`
-	ExtGroupId string `json:"extGroupId,omitempty" yaml:"extGroupId" bson:"extGroupId,omitempty"`
-}
diff --git a/models/model_notification.go b/models/model_notification.go
deleted file mode 100644
index c361c381..00000000
--- a/models/model_notification.go
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Npcf_BDTPolicyControl Service API
- *
- * PCF BDT Policy Control Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.554 V16.7.0; 5G System; Background Data Transfer Policy Control Service.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.554/
- *
- * API version: 1.1.3
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-// Describes a BDT notification.
-type Notification struct {
-	// string identifying a BDT Reference ID as defined in subclause 5.3.3 of 3GPP TS 29.154.
-	BdtRefId string `json:"bdtRefId" yaml:"bdtRefId" bson:"bdtRefId,omitempty"`
-	// Contains a list of the candidate transfer policies from which the AF may select a new transfer policy due to a network performance is below the criteria set by the operator.
-	CandPolicies []TransferPolicy `json:"candPolicies,omitempty" yaml:"candPolicies" bson:"candPolicies,omitempty"`
-	NwAreaInfo   *NetworkAreaInfo `json:"nwAreaInfo,omitempty" yaml:"nwAreaInfo" bson:"nwAreaInfo,omitempty"`
-	TimeWindow   *TimeWindow      `json:"timeWindow,omitempty" yaml:"timeWindow" bson:"timeWindow,omitempty"`
-}
diff --git a/models/model_notification_data.go b/models/model_notification_data.go
deleted file mode 100644
index 2c4c04dd..00000000
--- a/models/model_notification_data.go
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * NRF NFManagement Service
- *
- * NRF NFManagement Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.510 V16.9.0; 5G System; Network Function Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.510/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-// Data sent in notifications from NRF to subscribed NF Instances
-type NotificationData struct {
-	Event          NotificationEventType      `json:"event" yaml:"event" bson:"event,omitempty"`
-	NfInstanceUri  string                     `json:"nfInstanceUri" yaml:"nfInstanceUri" bson:"nfInstanceUri,omitempty"`
-	NfProfile      *NfProfileNotificationData `json:"nfProfile,omitempty" yaml:"nfProfile" bson:"nfProfile,omitempty"`
-	ProfileChanges []ChangeItem               `json:"profileChanges,omitempty" yaml:"profileChanges" bson:"profileChanges,omitempty"`
-	ConditionEvent ConditionEventType         `json:"conditionEvent,omitempty" yaml:"conditionEvent" bson:"conditionEvent,omitempty"`
-}
diff --git a/models/model_notification_method.go b/models/model_notification_method.go
deleted file mode 100644
index 0b5218c1..00000000
--- a/models/model_notification_method.go
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Nsmf_EventExposure
- *
- * Session Management Event Exposure Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.508 V16.8.0; 5G System; Session Management Event Exposure Service.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.508/
- *
- * API version: 1.1.2
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type NotificationMethod string
-
-// List of NotificationMethod
-const (
-	NotificationMethod_PERIODIC           NotificationMethod = "PERIODIC"
-	NotificationMethod_ONE_TIME           NotificationMethod = "ONE_TIME"
-	NotificationMethod_ON_EVENT_DETECTION NotificationMethod = "ON_EVENT_DETECTION"
-)
diff --git a/models/model_notification_type.go b/models/model_notification_type.go
deleted file mode 100644
index ec8d59af..00000000
--- a/models/model_notification_type.go
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * NRF NFManagement Service
- *
- * NRF NFManagement Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.510 V16.9.0; 5G System; Network Function Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.510/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type NotificationType string
-
-// List of NotificationType
-const (
-	NotificationType_N1_MESSAGES                  NotificationType = "N1_MESSAGES"
-	NotificationType_N2_INFORMATION               NotificationType = "N2_INFORMATION"
-	NotificationType_LOCATION_NOTIFICATION        NotificationType = "LOCATION_NOTIFICATION"
-	NotificationType_DATA_REMOVAL_NOTIFICATION    NotificationType = "DATA_REMOVAL_NOTIFICATION"
-	NotificationType_DATA_CHANGE_NOTIFICATION     NotificationType = "DATA_CHANGE_NOTIFICATION"
-	NotificationType_LOCATION_UPDATE_NOTIFICATION NotificationType = "LOCATION_UPDATE_NOTIFICATION"
-	NotificationType_NSSAA_REAUTH_NOTIFICATION    NotificationType = "NSSAA_REAUTH_NOTIFICATION"
-	NotificationType_NSSAA_REVOC_NOTIFICATION     NotificationType = "NSSAA_REVOC_NOTIFICATION"
-)
diff --git a/models/model_null_response_200.go b/models/model_null_response_200.go
deleted file mode 100644
index 4507ecc2..00000000
--- a/models/model_null_response_200.go
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Npcf_SMPolicyControl API
- *
- * Session Management Policy Control Service © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.512 V16.10.0; 5G System; Session Management Policy Control Service.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.512/
- *
- * API version: 1.1.6
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type NullResponse200 struct {
-	AccessType       AccessType          `json:"accessType,omitempty" yaml:"accessType" bson:"accessType,omitempty"`
-	RatType          RatType             `json:"ratType,omitempty" yaml:"ratType" bson:"ratType,omitempty"`
-	ServNfId         *ServingNfIdentity  `json:"servNfId,omitempty" yaml:"servNfId" bson:"servNfId,omitempty"`
-	ServingNetwork   *PlmnIdNid          `json:"servingNetwork,omitempty" yaml:"servingNetwork" bson:"servingNetwork,omitempty"`
-	UserLocationInfo *UserLocation       `json:"userLocationInfo,omitempty" yaml:"userLocationInfo" bson:"userLocationInfo,omitempty"`
-	UeTimeZone       string              `json:"ueTimeZone,omitempty" yaml:"ueTimeZone" bson:"ueTimeZone,omitempty"`
-	NetLocAccSupp    NetLocAccessSupport `json:"netLocAccSupp,omitempty" yaml:"netLocAccSupp" bson:"netLocAccSupp,omitempty"`
-}
diff --git a/models/model_pdu_session_status_cfg.go b/models/model_pdu_session_status_cfg.go
deleted file mode 100644
index 67cfd32f..00000000
--- a/models/model_pdu_session_status_cfg.go
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Nudr_DataRepository API OpenAPI file
- *
- * Unified Data Repository Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.504 V16.9.0; 5G System; Unified Data Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.504/
- *
- * API version: 2.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type PduSessionStatusCfg struct {
-	Dnn string `json:"dnn,omitempty" yaml:"dnn" bson:"dnn,omitempty"`
-}
diff --git a/models/model_pfd.go b/models/model_pfd.go
deleted file mode 100644
index de93ab23..00000000
--- a/models/model_pfd.go
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 3gpp-pfd-management
- *
- * API for PFD management. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.122 V16.9.0 T8 reference point for Northbound APIs
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.122/
- *
- * API version: 1.1.1
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type Pfd struct {
-	// Identifies a PDF of an application identifier.
-	PfdId string `json:"pfdId" yaml:"pfdId" bson:"pfdId"`
-	// Represents a 3-tuple with protocol, server ip and server port for UL/DL application traffic. The content of the string has the same encoding as the IPFilterRule AVP value as defined in IETF RFC 6733.
-	FlowDescriptions []string `json:"flowDescriptions,omitempty" yaml:"flowDescriptions" bson:"flowDescriptions"`
-	// Indicates a URL or a regular expression which is used to match the significant parts of the URL.
-	Urls []string `json:"urls,omitempty" yaml:"urls" bson:"urls"`
-	// Indicates an FQDN or a regular expression as a domain name matching criteria.
-	DomainNames []string           `json:"domainNames,omitempty" yaml:"domainNames" bson:"domainNames"`
-	DnProtocol  DomainNameProtocol `json:"dnProtocol,omitempty" yaml:"dnProtocol" bson:"dnProtocol"`
-}
diff --git a/models/model_pfd_data.go b/models/model_pfd_data.go
deleted file mode 100644
index 2d67ef7e..00000000
--- a/models/model_pfd_data.go
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * NRF NFManagement Service
- *
- * NRF NFManagement Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.510 V16.9.0; 5G System; Network Function Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.510/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-// List of Application IDs and/or AF IDs managed by a given NEF Instance
-type PfdData struct {
-	AppIds []string `json:"appIds,omitempty" yaml:"appIds" bson:"appIds,omitempty"`
-	AfIds  []string `json:"afIds,omitempty" yaml:"afIds" bson:"afIds,omitempty"`
-}
diff --git a/models/model_pfd_management.go b/models/model_pfd_management.go
deleted file mode 100644
index a8616602..00000000
--- a/models/model_pfd_management.go
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 3gpp-pfd-management
- *
- * API for PFD management. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.122 V16.9.0 T8 reference point for Northbound APIs
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.122/
- *
- * API version: 1.1.1
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type PfdManagement struct {
-	// string formatted according to IETF RFC 3986 identifying a referenced resource.
-	Self              string `json:"self,omitempty" yaml:"self" bson:"self"`
-	SupportedFeatures string `json:"supportedFeatures,omitempty" yaml:"supportedFeatures" bson:"supportedFeatures"`
-	// Each element uniquely identifies the PFDs for an external application identifier. Each element is identified in the map via an external application identifier as key. The response shall include successfully provisioned PFD data of application(s).
-	PfdDatas map[string]PfdPfdData `json:"pfdDatas" yaml:"pfdDatas" bson:"pfdDatas"`
-	// Supplied by the SCEF and contains the external application identifiers for which PFD(s) are not added or modified successfully. The failure reason is also included. Each element provides the related information for one or more external application identifier(s) and is identified in the map via the failure identifier as key.
-	PfdReports map[string]PfdReport `json:"pfdReports,omitempty" yaml:"pfdReports" bson:"pfdReports"`
-	// string formatted according to IETF RFC 3986 identifying a referenced resource.
-	NotificationDestination string `json:"notificationDestination,omitempty" yaml:"notificationDestination" bson:"notificationDestination"`
-	// Set to true by the SCS/AS to request the SCEF to send a test notification as defined in subclause 5.2.5.3. Set to false or omitted otherwise.
-	RequestTestNotification bool                `json:"requestTestNotification,omitempty" yaml:"requestTestNotification" bson:"requestTestNotification"`
-	WebsockNotifConfig      *WebsockNotifConfig `json:"websockNotifConfig,omitempty" yaml:"websockNotifConfig" bson:"websockNotifConfig"`
-}
diff --git a/models/model_pfd_pfd_data.go b/models/model_pfd_pfd_data.go
deleted file mode 100644
index 109b2c5b..00000000
--- a/models/model_pfd_pfd_data.go
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 3gpp-pfd-management
- *
- * API for PFD management. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.122 V16.9.0 T8 reference point for Northbound APIs
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.122/
- *
- * API version: 1.1.1
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type PfdPfdData struct {
-	// Each element uniquely external application identifier
-	ExternalAppId string `json:"externalAppId" yaml:"externalAppId" bson:"externalAppId"`
-	// string formatted according to IETF RFC 3986 identifying a referenced resource.
-	Self string `json:"self,omitempty" yaml:"self" bson:"self"`
-	// Contains the PFDs of the external application identifier. Each PFD is identified in the map via a key containing the PFD identifier.
-	Pfds map[string]Pfd `json:"pfds" yaml:"pfds" bson:"pfds"`
-	// Unsigned integer identifying a period of time in units of seconds with \"nullable=true\" property.
-	AllowedDelay int32 `json:"allowedDelay,omitempty" yaml:"allowedDelay" bson:"allowedDelay"`
-	// Unsigned integer identifying a period of time in units of seconds with \"readOnly=true\" property.
-	CachingTime int32 `json:"cachingTime,omitempty" yaml:"cachingTime" bson:"cachingTime"`
-}
diff --git a/models/model_pfd_report.go b/models/model_pfd_report.go
deleted file mode 100644
index 7d0dcf09..00000000
--- a/models/model_pfd_report.go
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * 3gpp-pfd-management
- *
- * API for PFD management. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.122 V16.9.0 T8 reference point for Northbound APIs
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.122/
- *
- * API version: 1.1.1
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type PfdReport struct {
-	// Identifies the external application identifier(s) which PFD(s) are not added or modified successfully
-	ExternalAppIds []string    `json:"externalAppIds" yaml:"externalAppIds" bson:"externalAppIds"`
-	FailureCode    FailureCode `json:"failureCode" yaml:"failureCode" bson:"failureCode"`
-	// Unsigned integer identifying a period of time in units of seconds.
-	CachingTime  int32                  `json:"cachingTime,omitempty" yaml:"cachingTime" bson:"cachingTime"`
-	LocationArea *UserPlaneLocationArea `json:"locationArea,omitempty" yaml:"locationArea" bson:"locationArea"`
-}
diff --git a/models/model_policy_auth_qos_notification_control_info.go b/models/model_policy_auth_qos_notification_control_info.go
deleted file mode 100644
index f4f4f338..00000000
--- a/models/model_policy_auth_qos_notification_control_info.go
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Npcf_PolicyAuthorization Service API
- *
- * PCF Policy Authorization Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.514 V16.10.0; 5G System; Policy Authorization Service;Stage 3.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.514/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-// Indicates whether the QoS targets for a GRB flow are not guaranteed or guaranteed again
-type PolicyAuthQosNotificationControlInfo struct {
-	NotifType QosNotifType `json:"notifType" yaml:"notifType" bson:"notifType,omitempty"`
-	Flows     []Flows      `json:"flows,omitempty" yaml:"flows" bson:"flows,omitempty"`
-	AltSerReq string       `json:"altSerReq,omitempty" yaml:"altSerReq" bson:"altSerReq,omitempty"`
-}
diff --git a/models/model_post_sm_contexts_error.go b/models/model_post_sm_contexts_error.go
deleted file mode 100644
index 4348ef1b..00000000
--- a/models/model_post_sm_contexts_error.go
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Nsmf_PDUSession
- *
- * SMF PDU Session Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.502 V16.9.0; 5G System; Session Management Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.502/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type PostSmContextsError struct {
-	JsonData              *SmContextCreateError `json:"jsonData,omitempty" yaml:"jsonData" bson:"jsonData,omitempty" multipart:"contentType:application/json,omitempty"`
-	BinaryDataN1SmMessage []byte                `json:"binaryDataN1SmMessage,omitempty" yaml:"binaryDataN1SmMessage" bson:"binaryDataN1SmMessage,omitempty" multipart:"contentType:application/vnd.3gpp.5gnas,ref:JsonData.N1SmMsg.ContentId,omitempty"`
-	BinaryDataN2SmMessage []byte                `json:"binaryDataN2SmMessage,omitempty" yaml:"binaryDataN2SmMessage" bson:"binaryDataN2SmMessage,omitempty" multipart:"contentType:application/vnd.3gpp.ngap,ref:JsonData.N2SmInfo.ContentId,omitempty"`
-}
diff --git a/models/model_pp_data_type.go b/models/model_pp_data_type.go
deleted file mode 100644
index 5ae62df1..00000000
--- a/models/model_pp_data_type.go
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Nudr_DataRepository API OpenAPI file
- *
- * Unified Data Repository Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.504 V16.9.0; 5G System; Unified Data Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.504/
- *
- * API version: 2.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type PpDataType string
-
-// List of PpDataType
-const (
-	PpDataType_COMMUNICATION_CHARACTERISTICS PpDataType = "COMMUNICATION_CHARACTERISTICS"
-	PpDataType_EXPECTED_UE_BEHAVIOUR         PpDataType = "EXPECTED_UE_BEHAVIOUR"
-	PpDataType_EC_RESTRICTION                PpDataType = "EC_RESTRICTION"
-	PpDataType_ACS_INFO                      PpDataType = "ACS_INFO"
-	PpDataType_TRACE                         PpDataType = "TRACE"
-	PpDataType_STN_SR                        PpDataType = "STN_SR"
-	PpDataType_LCS_PRIVACY                   PpDataType = "LCS_PRIVACY"
-	PpDataType_SOR_INFO                      PpDataType = "SOR_INFO"
-)
diff --git a/models/model_problem_details_1.go b/models/model_problem_details_1.go
deleted file mode 100644
index 2da3c2a0..00000000
--- a/models/model_problem_details_1.go
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Nudr_DataRepository API OpenAPI file
- *
- * Unified Data Repository Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.504 V16.9.0; 5G System; Unified Data Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.504/
- *
- * API version: 2.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type ProblemDetails1 struct {
-	// string providing an URI formatted according to IETF RFC 3986.
-	Type string `json:"type,omitempty" yaml:"type" bson:"type,omitempty"`
-	// A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem.
-	Title string `json:"title,omitempty" yaml:"title" bson:"title,omitempty"`
-	// The HTTP status code for this occurrence of the problem.
-	Status int32 `json:"status,omitempty" yaml:"status" bson:"status,omitempty"`
-	// A human-readable explanation specific to this occurrence of the problem.
-	Detail string `json:"detail,omitempty" yaml:"detail" bson:"detail,omitempty"`
-	// string providing an URI formatted according to IETF RFC 3986.
-	Instance string `json:"instance,omitempty" yaml:"instance" bson:"instance,omitempty"`
-	// A machine-readable application error cause specific to this occurrence of the problem. This IE should be present and provide application-related error information, if available.
-	Cause string `json:"cause,omitempty" yaml:"cause" bson:"cause,omitempty"`
-	// Description of invalid parameters, for a request rejected due to invalid parameters.
-	InvalidParams []InvalidParam1 `json:"invalidParams,omitempty" yaml:"invalidParams" bson:"invalidParams,omitempty"`
-}
diff --git a/models/model_qos_flow_add_modify_request_item.go b/models/model_qos_flow_add_modify_request_item.go
deleted file mode 100644
index 115bf48d..00000000
--- a/models/model_qos_flow_add_modify_request_item.go
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Nsmf_PDUSession
- *
- * SMF PDU Session Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.502 V16.9.0; 5G System; Session Management Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.502/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type QosFlowAddModifyRequestItem struct {
-	Qfi                int32             `json:"qfi" yaml:"qfi" bson:"qfi,omitempty"`
-	Ebi                int32             `json:"ebi,omitempty" yaml:"ebi" bson:"ebi,omitempty"`
-	QosRules           string            `json:"qosRules,omitempty" yaml:"qosRules" bson:"qosRules,omitempty"`
-	QosFlowDescription string            `json:"qosFlowDescription,omitempty" yaml:"qosFlowDescription" bson:"qosFlowDescription,omitempty"`
-	QosFlowProfile     *QosFlowProfile   `json:"qosFlowProfile,omitempty" yaml:"qosFlowProfile" bson:"qosFlowProfile,omitempty"`
-	AssociatedAnType   QosFlowAccessType `json:"associatedAnType,omitempty" yaml:"associatedAnType" bson:"associatedAnType,omitempty"`
-}
diff --git a/models/model_qos_flow_profile.go b/models/model_qos_flow_profile.go
deleted file mode 100644
index 7f628c65..00000000
--- a/models/model_qos_flow_profile.go
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Nsmf_PDUSession
- *
- * SMF PDU Session Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.502 V16.9.0; 5G System; Session Management Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.502/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type QosFlowProfile struct {
-	Var5qi                int32                  `json:"5qi" yaml:"5qi" bson:"5qi,omitempty"`
-	NonDynamic5Qi         *NonDynamic5Qi         `json:"nonDynamic5Qi,omitempty" yaml:"nonDynamic5Qi" bson:"nonDynamic5Qi,omitempty"`
-	Dynamic5Qi            *Dynamic5Qi            `json:"dynamic5Qi,omitempty" yaml:"dynamic5Qi" bson:"dynamic5Qi,omitempty"`
-	Arp                   *Arp                   `json:"arp,omitempty" yaml:"arp" bson:"arp,omitempty"`
-	GbrQosFlowInfo        *GbrQosFlowInformation `json:"gbrQosFlowInfo,omitempty" yaml:"gbrQosFlowInfo" bson:"gbrQosFlowInfo,omitempty"`
-	Rqa                   ReflectiveQoSAttribute `json:"rqa,omitempty" yaml:"rqa" bson:"rqa,omitempty"`
-	AdditionalQosFlowInfo *AdditionalQosFlowInfo `json:"additionalQosFlowInfo,omitempty" yaml:"additionalQosFlowInfo" bson:"additionalQosFlowInfo,omitempty"`
-	QosMonitoringReq      QosMonitoringReq       `json:"qosMonitoringReq,omitempty" yaml:"qosMonitoringReq" bson:"qosMonitoringReq,omitempty"`
-	QosRepPeriod          int32                  `json:"qosRepPeriod,omitempty" yaml:"qosRepPeriod" bson:"qosRepPeriod,omitempty"`
-}
diff --git a/models/model_redirect_address_type.go b/models/model_redirect_address_type.go
deleted file mode 100644
index 72643450..00000000
--- a/models/model_redirect_address_type.go
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Npcf_SMPolicyControl API
- *
- * Session Management Policy Control Service © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.512 V16.10.0; 5G System; Session Management Policy Control Service.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.512/
- *
- * API version: 1.1.6
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type RedirectAddressType string
-
-// List of RedirectAddressType
-const (
-	RedirectAddressType_IPV4_ADDR RedirectAddressType = "IPV4_ADDR"
-	RedirectAddressType_IPV6_ADDR RedirectAddressType = "IPV6_ADDR"
-	RedirectAddressType_URL       RedirectAddressType = "URL"
-	RedirectAddressType_SIP_URI   RedirectAddressType = "SIP_URI"
-)
diff --git a/models/model_reporting_options.go b/models/model_reporting_options.go
deleted file mode 100644
index 131a02b3..00000000
--- a/models/model_reporting_options.go
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Nudr_DataRepository API OpenAPI file
- *
- * Unified Data Repository Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.504 V16.9.0; 5G System; Unified Data Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.504/
- *
- * API version: 2.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-import (
-	"time"
-)
-
-type ReportingOptions struct {
-	ReportMode      EventReportMode `json:"reportMode,omitempty" yaml:"reportMode" bson:"reportMode,omitempty"`
-	MaxNumOfReports int32           `json:"maxNumOfReports,omitempty" yaml:"maxNumOfReports" bson:"maxNumOfReports,omitempty"`
-	Expiry          *time.Time      `json:"expiry,omitempty" yaml:"expiry" bson:"expiry,omitempty"`
-	SamplingRatio   int32           `json:"samplingRatio,omitempty" yaml:"samplingRatio" bson:"samplingRatio,omitempty"`
-	GuardTime       int32           `json:"guardTime,omitempty" yaml:"guardTime" bson:"guardTime,omitempty"`
-	ReportPeriod    int32           `json:"reportPeriod,omitempty" yaml:"reportPeriod" bson:"reportPeriod,omitempty"`
-}
diff --git a/models/model_roaming_charging_profile.go b/models/model_roaming_charging_profile.go
deleted file mode 100644
index f155c75a..00000000
--- a/models/model_roaming_charging_profile.go
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Nsmf_PDUSession
- *
- * SMF PDU Session Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.502 V16.9.0; 5G System; Session Management Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.502/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type RoamingChargingProfile struct {
-	Triggers            []Trigger           `json:"triggers,omitempty" yaml:"triggers" bson:"triggers,omitempty"`
-	PartialRecordMethod PartialRecordMethod `json:"partialRecordMethod,omitempty" yaml:"partialRecordMethod" bson:"partialRecordMethod,omitempty"`
-}
diff --git a/models/model_shared_data.go b/models/model_shared_data.go
deleted file mode 100644
index 648cac40..00000000
--- a/models/model_shared_data.go
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Nudr_DataRepository API OpenAPI file
- *
- * Unified Data Repository Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.504 V16.9.0; 5G System; Unified Data Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.504/
- *
- * API version: 2.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type SharedData struct {
-	SharedDataId            string                             `json:"sharedDataId" yaml:"sharedDataId" bson:"sharedDataId,omitempty"`
-	SharedAmData            *AccessAndMobilitySubscriptionData `json:"sharedAmData,omitempty" yaml:"sharedAmData" bson:"sharedAmData,omitempty"`
-	SharedSmsSubsData       *SmsSubscriptionData               `json:"sharedSmsSubsData,omitempty" yaml:"sharedSmsSubsData" bson:"sharedSmsSubsData,omitempty"`
-	SharedSmsMngSubsData    *SmsManagementSubscriptionData     `json:"sharedSmsMngSubsData,omitempty" yaml:"sharedSmsMngSubsData" bson:"sharedSmsMngSubsData,omitempty"`
-	SharedDnnConfigurations map[string]DnnConfiguration        `json:"sharedDnnConfigurations,omitempty" yaml:"sharedDnnConfigurations" bson:"sharedDnnConfigurations,omitempty"`
-	SharedTraceData         *TraceData                         `json:"sharedTraceData,omitempty" yaml:"sharedTraceData" bson:"sharedTraceData,omitempty"`
-	SharedSnssaiInfos       map[string]SnssaiInfo              `json:"sharedSnssaiInfos,omitempty" yaml:"sharedSnssaiInfos" bson:"sharedSnssaiInfos,omitempty"`
-	SharedVnGroupDatas      map[string]VnGroupData             `json:"sharedVnGroupDatas,omitempty" yaml:"sharedVnGroupDatas" bson:"sharedVnGroupDatas,omitempty"`
-}
diff --git a/models/model_sm_context_create_data.go b/models/model_sm_context_create_data.go
deleted file mode 100644
index 0980c40e..00000000
--- a/models/model_sm_context_create_data.go
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Nsmf_PDUSession
- *
- * SMF PDU Session Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.502 V16.9.0; 5G System; Session Management Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.502/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type SmContextCreateData struct {
-	Supi                     string                    `json:"supi,omitempty" yaml:"supi" bson:"supi,omitempty"`
-	UnauthenticatedSupi      bool                      `json:"unauthenticatedSupi,omitempty" yaml:"unauthenticatedSupi" bson:"unauthenticatedSupi,omitempty"`
-	Pei                      string                    `json:"pei,omitempty" yaml:"pei" bson:"pei,omitempty"`
-	Gpsi                     string                    `json:"gpsi,omitempty" yaml:"gpsi" bson:"gpsi,omitempty"`
-	PduSessionId             int32                     `json:"pduSessionId,omitempty" yaml:"pduSessionId" bson:"pduSessionId,omitempty"`
-	Dnn                      string                    `json:"dnn,omitempty" yaml:"dnn" bson:"dnn,omitempty"`
-	SelectedDnn              string                    `json:"selectedDnn,omitempty" yaml:"selectedDnn" bson:"selectedDnn,omitempty"`
-	SNssai                   *Snssai                   `json:"sNssai,omitempty" yaml:"sNssai" bson:"sNssai,omitempty"`
-	HplmnSnssai              *Snssai                   `json:"hplmnSnssai,omitempty" yaml:"hplmnSnssai" bson:"hplmnSnssai,omitempty"`
-	ServingNfId              string                    `json:"servingNfId" yaml:"servingNfId" bson:"servingNfId,omitempty"`
-	Guami                    *Guami                    `json:"guami,omitempty" yaml:"guami" bson:"guami,omitempty"`
-	ServiceName              ServiceName               `json:"serviceName,omitempty" yaml:"serviceName" bson:"serviceName,omitempty"`
-	ServingNetwork           *PlmnIdNid                `json:"servingNetwork" yaml:"servingNetwork" bson:"servingNetwork,omitempty"`
-	RequestType              RequestType               `json:"requestType,omitempty" yaml:"requestType" bson:"requestType,omitempty"`
-	N1SmMsg                  *RefToBinaryData          `json:"n1SmMsg,omitempty" yaml:"n1SmMsg" bson:"n1SmMsg,omitempty"`
-	AnType                   AccessType                `json:"anType" yaml:"anType" bson:"anType,omitempty"`
-	AdditionalAnType         AccessType                `json:"additionalAnType,omitempty" yaml:"additionalAnType" bson:"additionalAnType,omitempty"`
-	RatType                  RatType                   `json:"ratType,omitempty" yaml:"ratType" bson:"ratType,omitempty"`
-	PresenceInLadn           PresenceState             `json:"presenceInLadn,omitempty" yaml:"presenceInLadn" bson:"presenceInLadn,omitempty"`
-	UeLocation               *UserLocation             `json:"ueLocation,omitempty" yaml:"ueLocation" bson:"ueLocation,omitempty"`
-	UeTimeZone               string                    `json:"ueTimeZone,omitempty" yaml:"ueTimeZone" bson:"ueTimeZone,omitempty"`
-	AddUeLocation            *UserLocation             `json:"addUeLocation,omitempty" yaml:"addUeLocation" bson:"addUeLocation,omitempty"`
-	SmContextStatusUri       string                    `json:"smContextStatusUri" yaml:"smContextStatusUri" bson:"smContextStatusUri,omitempty"`
-	HSmfUri                  string                    `json:"hSmfUri,omitempty" yaml:"hSmfUri" bson:"hSmfUri,omitempty"`
-	HSmfId                   string                    `json:"hSmfId,omitempty" yaml:"hSmfId" bson:"hSmfId,omitempty"`
-	SmfUri                   string                    `json:"smfUri,omitempty" yaml:"smfUri" bson:"smfUri,omitempty"`
-	SmfId                    string                    `json:"smfId,omitempty" yaml:"smfId" bson:"smfId,omitempty"`
-	AdditionalHsmfUri        []string                  `json:"additionalHsmfUri,omitempty" yaml:"additionalHsmfUri" bson:"additionalHsmfUri,omitempty"`
-	AdditionalHsmfId         []string                  `json:"additionalHsmfId,omitempty" yaml:"additionalHsmfId" bson:"additionalHsmfId,omitempty"`
-	AdditionalSmfUri         []string                  `json:"additionalSmfUri,omitempty" yaml:"additionalSmfUri" bson:"additionalSmfUri,omitempty"`
-	AdditionalSmfId          []string                  `json:"additionalSmfId,omitempty" yaml:"additionalSmfId" bson:"additionalSmfId,omitempty"`
-	OldPduSessionId          int32                     `json:"oldPduSessionId,omitempty" yaml:"oldPduSessionId" bson:"oldPduSessionId,omitempty"`
-	PduSessionsActivateList  []int32                   `json:"pduSessionsActivateList,omitempty" yaml:"pduSessionsActivateList" bson:"pduSessionsActivateList,omitempty"`
-	UeEpsPdnConnection       string                    `json:"ueEpsPdnConnection,omitempty" yaml:"ueEpsPdnConnection" bson:"ueEpsPdnConnection,omitempty"`
-	HoState                  HoState                   `json:"hoState,omitempty" yaml:"hoState" bson:"hoState,omitempty"`
-	PcfId                    string                    `json:"pcfId,omitempty" yaml:"pcfId" bson:"pcfId,omitempty"`
-	PcfGroupId               string                    `json:"pcfGroupId,omitempty" yaml:"pcfGroupId" bson:"pcfGroupId,omitempty"`
-	PcfSetId                 string                    `json:"pcfSetId,omitempty" yaml:"pcfSetId" bson:"pcfSetId,omitempty"`
-	NrfUri                   string                    `json:"nrfUri,omitempty" yaml:"nrfUri" bson:"nrfUri,omitempty"`
-	SupportedFeatures        string                    `json:"supportedFeatures,omitempty" yaml:"supportedFeatures" bson:"supportedFeatures,omitempty"`
-	SelMode                  DnnSelectionMode          `json:"selMode,omitempty" yaml:"selMode" bson:"selMode,omitempty"`
-	BackupAmfInfo            []BackupAmfInfo           `json:"backupAmfInfo,omitempty" yaml:"backupAmfInfo" bson:"backupAmfInfo,omitempty"`
-	TraceData                *TraceData                `json:"traceData,omitempty" yaml:"traceData" bson:"traceData,omitempty"`
-	UdmGroupId               string                    `json:"udmGroupId,omitempty" yaml:"udmGroupId" bson:"udmGroupId,omitempty"`
-	RoutingIndicator         string                    `json:"routingIndicator,omitempty" yaml:"routingIndicator" bson:"routingIndicator,omitempty"`
-	EpsInterworkingInd       EpsInterworkingIndication `json:"epsInterworkingInd,omitempty" yaml:"epsInterworkingInd" bson:"epsInterworkingInd,omitempty"`
-	IndirectForwardingFlag   bool                      `json:"indirectForwardingFlag,omitempty" yaml:"indirectForwardingFlag" bson:"indirectForwardingFlag,omitempty"`
-	DirectForwardingFlag     bool                      `json:"directForwardingFlag,omitempty" yaml:"directForwardingFlag" bson:"directForwardingFlag,omitempty"`
-	TargetId                 *NgRanTargetId            `json:"targetId,omitempty" yaml:"targetId" bson:"targetId,omitempty"`
-	EpsBearerCtxStatus       string                    `json:"epsBearerCtxStatus,omitempty" yaml:"epsBearerCtxStatus" bson:"epsBearerCtxStatus,omitempty"`
-	CpCiotEnabled            bool                      `json:"cpCiotEnabled,omitempty" yaml:"cpCiotEnabled" bson:"cpCiotEnabled,omitempty"`
-	CpOnlyInd                bool                      `json:"cpOnlyInd,omitempty" yaml:"cpOnlyInd" bson:"cpOnlyInd,omitempty"`
-	InvokeNef                bool                      `json:"invokeNef,omitempty" yaml:"invokeNef" bson:"invokeNef,omitempty"`
-	MaRequestInd             bool                      `json:"maRequestInd,omitempty" yaml:"maRequestInd" bson:"maRequestInd,omitempty"`
-	MaNwUpgradeInd           bool                      `json:"maNwUpgradeInd,omitempty" yaml:"maNwUpgradeInd" bson:"maNwUpgradeInd,omitempty"`
-	N2SmInfo                 *RefToBinaryData          `json:"n2SmInfo,omitempty" yaml:"n2SmInfo" bson:"n2SmInfo,omitempty"`
-	N2SmInfoType             N2SmInfoType              `json:"n2SmInfoType,omitempty" yaml:"n2SmInfoType" bson:"n2SmInfoType,omitempty"`
-	N2SmInfoExt1             *RefToBinaryData          `json:"n2SmInfoExt1,omitempty" yaml:"n2SmInfoExt1" bson:"n2SmInfoExt1,omitempty"`
-	N2SmInfoTypeExt1         N2SmInfoType              `json:"n2SmInfoTypeExt1,omitempty" yaml:"n2SmInfoTypeExt1" bson:"n2SmInfoTypeExt1,omitempty"`
-	SmContextRef             string                    `json:"smContextRef,omitempty" yaml:"smContextRef" bson:"smContextRef,omitempty"`
-	SmContextSmfId           string                    `json:"smContextSmfId,omitempty" yaml:"smContextSmfId" bson:"smContextSmfId,omitempty"`
-	SmContextSmfSetId        string                    `json:"smContextSmfSetId,omitempty" yaml:"smContextSmfSetId" bson:"smContextSmfSetId,omitempty"`
-	SmContextSmfServiceSetId string                    `json:"smContextSmfServiceSetId,omitempty" yaml:"smContextSmfServiceSetId" bson:"smContextSmfServiceSetId,omitempty"`
-	SmContextSmfBinding      SbiBindingLevel           `json:"smContextSmfBinding,omitempty" yaml:"smContextSmfBinding" bson:"smContextSmfBinding,omitempty"`
-	UpCnxState               UpCnxState                `json:"upCnxState,omitempty" yaml:"upCnxState" bson:"upCnxState,omitempty"`
-	SmallDataRateStatus      *SmallDataRateStatus      `json:"smallDataRateStatus,omitempty" yaml:"smallDataRateStatus" bson:"smallDataRateStatus,omitempty"`
-	ApnRateStatus            *ApnRateStatus            `json:"apnRateStatus,omitempty" yaml:"apnRateStatus" bson:"apnRateStatus,omitempty"`
-	ExtendedNasSmTimerInd    bool                      `json:"extendedNasSmTimerInd,omitempty" yaml:"extendedNasSmTimerInd" bson:"extendedNasSmTimerInd,omitempty"`
-	DlDataWaitingInd         bool                      `json:"dlDataWaitingInd,omitempty" yaml:"dlDataWaitingInd" bson:"dlDataWaitingInd,omitempty"`
-	DdnFailureSubs           *DdnFailureSubs           `json:"ddnFailureSubs,omitempty" yaml:"ddnFailureSubs" bson:"ddnFailureSubs,omitempty"`
-	SmfTransferInd           bool                      `json:"smfTransferInd,omitempty" yaml:"smfTransferInd" bson:"smfTransferInd,omitempty"`
-	OldSmfId                 string                    `json:"oldSmfId,omitempty" yaml:"oldSmfId" bson:"oldSmfId,omitempty"`
-	OldSmContextRef          string                    `json:"oldSmContextRef,omitempty" yaml:"oldSmContextRef" bson:"oldSmContextRef,omitempty"`
-	WAgfInfo                 *WAgfInfo                 `json:"wAgfInfo,omitempty" yaml:"wAgfInfo" bson:"wAgfInfo,omitempty"`
-	TngfInfo                 *TngfInfo                 `json:"tngfInfo,omitempty" yaml:"tngfInfo" bson:"tngfInfo,omitempty"`
-	TwifInfo                 *TwifInfo                 `json:"twifInfo,omitempty" yaml:"twifInfo" bson:"twifInfo,omitempty"`
-	RanUnchangedInd          bool                      `json:"ranUnchangedInd,omitempty" yaml:"ranUnchangedInd" bson:"ranUnchangedInd,omitempty"`
-}
diff --git a/models/model_sm_context_created_data.go b/models/model_sm_context_created_data.go
deleted file mode 100644
index 7fbe44d0..00000000
--- a/models/model_sm_context_created_data.go
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Nsmf_PDUSession
- *
- * SMF PDU Session Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.502 V16.9.0; 5G System; Session Management Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.502/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-import (
-	"time"
-)
-
-type SmContextCreatedData struct {
-	HSmfUri              string           `json:"hSmfUri,omitempty" yaml:"hSmfUri" bson:"hSmfUri,omitempty"`
-	SmfUri               string           `json:"smfUri,omitempty" yaml:"smfUri" bson:"smfUri,omitempty"`
-	PduSessionId         int32            `json:"pduSessionId,omitempty" yaml:"pduSessionId" bson:"pduSessionId,omitempty"`
-	SNssai               *Snssai          `json:"sNssai,omitempty" yaml:"sNssai" bson:"sNssai,omitempty"`
-	UpCnxState           UpCnxState       `json:"upCnxState,omitempty" yaml:"upCnxState" bson:"upCnxState,omitempty"`
-	N2SmInfo             *RefToBinaryData `json:"n2SmInfo,omitempty" yaml:"n2SmInfo" bson:"n2SmInfo,omitempty"`
-	N2SmInfoType         N2SmInfoType     `json:"n2SmInfoType,omitempty" yaml:"n2SmInfoType" bson:"n2SmInfoType,omitempty"`
-	AllocatedEbiList     []EbiArpMapping  `json:"allocatedEbiList,omitempty" yaml:"allocatedEbiList" bson:"allocatedEbiList,omitempty"`
-	HoState              HoState          `json:"hoState,omitempty" yaml:"hoState" bson:"hoState,omitempty"`
-	Gpsi                 string           `json:"gpsi,omitempty" yaml:"gpsi" bson:"gpsi,omitempty"`
-	SmfServiceInstanceId string           `json:"smfServiceInstanceId,omitempty" yaml:"smfServiceInstanceId" bson:"smfServiceInstanceId,omitempty"`
-	RecoveryTime         *time.Time       `json:"recoveryTime,omitempty" yaml:"recoveryTime" bson:"recoveryTime,omitempty"`
-	SupportedFeatures    string           `json:"supportedFeatures,omitempty" yaml:"supportedFeatures" bson:"supportedFeatures,omitempty"`
-	SelectedSmfId        string           `json:"selectedSmfId,omitempty" yaml:"selectedSmfId" bson:"selectedSmfId,omitempty"`
-	SelectedOldSmfId     string           `json:"selectedOldSmfId,omitempty" yaml:"selectedOldSmfId" bson:"selectedOldSmfId,omitempty"`
-}
diff --git a/models/model_sm_context_release_data.go b/models/model_sm_context_release_data.go
deleted file mode 100644
index 7f496541..00000000
--- a/models/model_sm_context_release_data.go
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Nsmf_PDUSession
- *
- * SMF PDU Session Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.502 V16.9.0; 5G System; Session Management Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.502/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type SmContextReleaseData struct {
-	Cause             Cause            `json:"cause,omitempty" yaml:"cause" bson:"cause,omitempty"`
-	NgApCause         *NgApCause       `json:"ngApCause,omitempty" yaml:"ngApCause" bson:"ngApCause,omitempty"`
-	Var5gMmCauseValue int32            `json:"5gMmCauseValue,omitempty" yaml:"5gMmCauseValue" bson:"5gMmCauseValue,omitempty"`
-	UeLocation        *UserLocation    `json:"ueLocation,omitempty" yaml:"ueLocation" bson:"ueLocation,omitempty"`
-	UeTimeZone        string           `json:"ueTimeZone,omitempty" yaml:"ueTimeZone" bson:"ueTimeZone,omitempty"`
-	AddUeLocation     *UserLocation    `json:"addUeLocation,omitempty" yaml:"addUeLocation" bson:"addUeLocation,omitempty"`
-	VsmfReleaseOnly   bool             `json:"vsmfReleaseOnly,omitempty" yaml:"vsmfReleaseOnly" bson:"vsmfReleaseOnly,omitempty"`
-	N2SmInfo          *RefToBinaryData `json:"n2SmInfo,omitempty" yaml:"n2SmInfo" bson:"n2SmInfo,omitempty"`
-	N2SmInfoType      N2SmInfoType     `json:"n2SmInfoType,omitempty" yaml:"n2SmInfoType" bson:"n2SmInfoType,omitempty"`
-	IsmfReleaseOnly   bool             `json:"ismfReleaseOnly,omitempty" yaml:"ismfReleaseOnly" bson:"ismfReleaseOnly,omitempty"`
-}
diff --git a/models/model_sm_context_status_notification.go b/models/model_sm_context_status_notification.go
deleted file mode 100644
index c84bc799..00000000
--- a/models/model_sm_context_status_notification.go
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Nsmf_PDUSession
- *
- * SMF PDU Session Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.502 V16.9.0; 5G System; Session Management Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.502/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type SmContextStatusNotification struct {
-	StatusInfo                        *StatusInfo          `json:"statusInfo" yaml:"statusInfo" bson:"statusInfo,omitempty"`
-	SmallDataRateStatus               *SmallDataRateStatus `json:"smallDataRateStatus,omitempty" yaml:"smallDataRateStatus" bson:"smallDataRateStatus,omitempty"`
-	ApnRateStatus                     *ApnRateStatus       `json:"apnRateStatus,omitempty" yaml:"apnRateStatus" bson:"apnRateStatus,omitempty"`
-	DdnFailureStatus                  bool                 `json:"ddnFailureStatus,omitempty" yaml:"ddnFailureStatus" bson:"ddnFailureStatus,omitempty"`
-	NotifyCorrelationIdsForddnFailure []string             `json:"notifyCorrelationIdsForddnFailure,omitempty" yaml:"notifyCorrelationIdsForddnFailure" bson:"notifyCorrelationIdsForddnFailure,omitempty"`
-	NewSmfId                          string               `json:"newSmfId,omitempty" yaml:"newSmfId" bson:"newSmfId,omitempty"`
-	NewSmfSetId                       string               `json:"newSmfSetId,omitempty" yaml:"newSmfSetId" bson:"newSmfSetId,omitempty"`
-	OldSmfId                          string               `json:"oldSmfId,omitempty" yaml:"oldSmfId" bson:"oldSmfId,omitempty"`
-	OldSmContextRef                   string               `json:"oldSmContextRef,omitempty" yaml:"oldSmContextRef" bson:"oldSmContextRef,omitempty"`
-	AltAnchorSmfUri                   string               `json:"altAnchorSmfUri,omitempty" yaml:"altAnchorSmfUri" bson:"altAnchorSmfUri,omitempty"`
-	AltAnchorSmfId                    string               `json:"altAnchorSmfId,omitempty" yaml:"altAnchorSmfId" bson:"altAnchorSmfId,omitempty"`
-}
diff --git a/models/model_sm_context_update_data.go b/models/model_sm_context_update_data.go
deleted file mode 100644
index 29414e42..00000000
--- a/models/model_sm_context_update_data.go
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Nsmf_PDUSession
- *
- * SMF PDU Session Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.502 V16.9.0; 5G System; Session Management Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.502/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type SmContextUpdateData struct {
-	Pei                       string                             `json:"pei,omitempty" yaml:"pei" bson:"pei,omitempty"`
-	ServingNfId               string                             `json:"servingNfId,omitempty" yaml:"servingNfId" bson:"servingNfId,omitempty"`
-	Guami                     *Guami                             `json:"guami,omitempty" yaml:"guami" bson:"guami,omitempty"`
-	ServingNetwork            *PlmnIdNid                         `json:"servingNetwork,omitempty" yaml:"servingNetwork" bson:"servingNetwork,omitempty"`
-	BackupAmfInfo             []BackupAmfInfo                    `json:"backupAmfInfo,omitempty" yaml:"backupAmfInfo" bson:"backupAmfInfo,omitempty"`
-	AnType                    AccessType                         `json:"anType,omitempty" yaml:"anType" bson:"anType,omitempty"`
-	AdditionalAnType          AccessType                         `json:"additionalAnType,omitempty" yaml:"additionalAnType" bson:"additionalAnType,omitempty"`
-	AnTypeToReactivate        AccessType                         `json:"anTypeToReactivate,omitempty" yaml:"anTypeToReactivate" bson:"anTypeToReactivate,omitempty"`
-	RatType                   RatType                            `json:"ratType,omitempty" yaml:"ratType" bson:"ratType,omitempty"`
-	PresenceInLadn            PresenceState                      `json:"presenceInLadn,omitempty" yaml:"presenceInLadn" bson:"presenceInLadn,omitempty"`
-	UeLocation                *UserLocation                      `json:"ueLocation,omitempty" yaml:"ueLocation" bson:"ueLocation,omitempty"`
-	UeTimeZone                string                             `json:"ueTimeZone,omitempty" yaml:"ueTimeZone" bson:"ueTimeZone,omitempty"`
-	AddUeLocation             *UserLocation                      `json:"addUeLocation,omitempty" yaml:"addUeLocation" bson:"addUeLocation,omitempty"`
-	UpCnxState                UpCnxState                         `json:"upCnxState,omitempty" yaml:"upCnxState" bson:"upCnxState,omitempty"`
-	HoState                   HoState                            `json:"hoState,omitempty" yaml:"hoState" bson:"hoState,omitempty"`
-	ToBeSwitched              bool                               `json:"toBeSwitched,omitempty" yaml:"toBeSwitched" bson:"toBeSwitched,omitempty"`
-	FailedToBeSwitched        bool                               `json:"failedToBeSwitched,omitempty" yaml:"failedToBeSwitched" bson:"failedToBeSwitched,omitempty"`
-	N1SmMsg                   *RefToBinaryData                   `json:"n1SmMsg,omitempty" yaml:"n1SmMsg" bson:"n1SmMsg,omitempty"`
-	N2SmInfo                  *RefToBinaryData                   `json:"n2SmInfo,omitempty" yaml:"n2SmInfo" bson:"n2SmInfo,omitempty"`
-	N2SmInfoType              N2SmInfoType                       `json:"n2SmInfoType,omitempty" yaml:"n2SmInfoType" bson:"n2SmInfoType,omitempty"`
-	TargetId                  *NgRanTargetId                     `json:"targetId,omitempty" yaml:"targetId" bson:"targetId,omitempty"`
-	TargetServingNfId         string                             `json:"targetServingNfId,omitempty" yaml:"targetServingNfId" bson:"targetServingNfId,omitempty"`
-	SmContextStatusUri        string                             `json:"smContextStatusUri,omitempty" yaml:"smContextStatusUri" bson:"smContextStatusUri,omitempty"`
-	DataForwarding            bool                               `json:"dataForwarding,omitempty" yaml:"dataForwarding" bson:"dataForwarding,omitempty"`
-	N9ForwardingTunnel        *TunnelInfo                        `json:"n9ForwardingTunnel,omitempty" yaml:"n9ForwardingTunnel" bson:"n9ForwardingTunnel,omitempty"`
-	N9DlForwardingTnlList     []IndirectDataForwardingTunnelInfo `json:"n9DlForwardingTnlList,omitempty" yaml:"n9DlForwardingTnlList" bson:"n9DlForwardingTnlList,omitempty"`
-	N9UlForwardingTnlList     []IndirectDataForwardingTunnelInfo `json:"n9UlForwardingTnlList,omitempty" yaml:"n9UlForwardingTnlList" bson:"n9UlForwardingTnlList,omitempty"`
-	EpsBearerSetup            []string                           `json:"epsBearerSetup,omitempty" yaml:"epsBearerSetup" bson:"epsBearerSetup,omitempty"`
-	RevokeEbiList             []int32                            `json:"revokeEbiList,omitempty" yaml:"revokeEbiList" bson:"revokeEbiList,omitempty"`
-	Release                   bool                               `json:"release,omitempty" yaml:"release" bson:"release,omitempty"`
-	Cause                     Cause                              `json:"cause,omitempty" yaml:"cause" bson:"cause,omitempty"`
-	NgApCause                 *NgApCause                         `json:"ngApCause,omitempty" yaml:"ngApCause" bson:"ngApCause,omitempty"`
-	Var5gMmCauseValue         int32                              `json:"5gMmCauseValue,omitempty" yaml:"5gMmCauseValue" bson:"5gMmCauseValue,omitempty"`
-	SNssai                    *Snssai                            `json:"sNssai,omitempty" yaml:"sNssai" bson:"sNssai,omitempty"`
-	TraceData                 *TraceData                         `json:"traceData,omitempty" yaml:"traceData" bson:"traceData,omitempty"`
-	EpsInterworkingInd        EpsInterworkingIndication          `json:"epsInterworkingInd,omitempty" yaml:"epsInterworkingInd" bson:"epsInterworkingInd,omitempty"`
-	AnTypeCanBeChanged        bool                               `json:"anTypeCanBeChanged,omitempty" yaml:"anTypeCanBeChanged" bson:"anTypeCanBeChanged,omitempty"`
-	N2SmInfoExt1              *RefToBinaryData                   `json:"n2SmInfoExt1,omitempty" yaml:"n2SmInfoExt1" bson:"n2SmInfoExt1,omitempty"`
-	N2SmInfoTypeExt1          N2SmInfoType                       `json:"n2SmInfoTypeExt1,omitempty" yaml:"n2SmInfoTypeExt1" bson:"n2SmInfoTypeExt1,omitempty"`
-	MaReleaseInd              MaReleaseIndication                `json:"maReleaseInd,omitempty" yaml:"maReleaseInd" bson:"maReleaseInd,omitempty"`
-	MaNwUpgradeInd            bool                               `json:"maNwUpgradeInd,omitempty" yaml:"maNwUpgradeInd" bson:"maNwUpgradeInd,omitempty"`
-	MaRequestInd              bool                               `json:"maRequestInd,omitempty" yaml:"maRequestInd" bson:"maRequestInd,omitempty"`
-	ExemptionInd              *ExemptionInd                      `json:"exemptionInd,omitempty" yaml:"exemptionInd" bson:"exemptionInd,omitempty"`
-	SupportedFeatures         string                             `json:"supportedFeatures,omitempty" yaml:"supportedFeatures" bson:"supportedFeatures,omitempty"`
-	MoExpDataCounter          *MoExpDataCounter                  `json:"moExpDataCounter,omitempty" yaml:"moExpDataCounter" bson:"moExpDataCounter,omitempty"`
-	ExtendedNasSmTimerInd     bool                               `json:"extendedNasSmTimerInd,omitempty" yaml:"extendedNasSmTimerInd" bson:"extendedNasSmTimerInd,omitempty"`
-	ForwardingFTeid           string                             `json:"forwardingFTeid,omitempty" yaml:"forwardingFTeid" bson:"forwardingFTeid,omitempty"`
-	ForwardingBearerContexts  []string                           `json:"forwardingBearerContexts,omitempty" yaml:"forwardingBearerContexts" bson:"forwardingBearerContexts,omitempty"`
-	DdnFailureSubs            *DdnFailureSubs                    `json:"ddnFailureSubs,omitempty" yaml:"ddnFailureSubs" bson:"ddnFailureSubs,omitempty"`
-	SkipN2PduSessionResRelInd bool                               `json:"skipN2PduSessionResRelInd,omitempty" yaml:"skipN2PduSessionResRelInd" bson:"skipN2PduSessionResRelInd,omitempty"`
-}
diff --git a/models/model_sm_policy_qos_notification_control_info.go b/models/model_sm_policy_qos_notification_control_info.go
deleted file mode 100644
index 81bb79bf..00000000
--- a/models/model_sm_policy_qos_notification_control_info.go
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Npcf_SMPolicyControl API
- *
- * Session Management Policy Control Service © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.512 V16.10.0; 5G System; Session Management Policy Control Service.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.512/
- *
- * API version: 1.1.6
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type SmPolicyQosNotificationControlInfo struct {
-	// An array of PCC rule id references to the PCC rules associated with the QoS notification control info.
-	RefPccRuleIds []string     `json:"refPccRuleIds" yaml:"refPccRuleIds" bson:"refPccRuleIds,omitempty"`
-	NotifType     QosNotifType `json:"notifType" yaml:"notifType" bson:"notifType,omitempty"`
-	// Represents the content version of some content.
-	ContVer       int32  `json:"contVer,omitempty" yaml:"contVer" bson:"contVer,omitempty"`
-	AltQosParamId string `json:"altQosParamId,omitempty" yaml:"altQosParamId" bson:"altQosParamId,omitempty"`
-}
diff --git a/models/model_sm_policy_termination_notification.go b/models/model_sm_policy_termination_notification.go
deleted file mode 100644
index ab7ec618..00000000
--- a/models/model_sm_policy_termination_notification.go
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Npcf_SMPolicyControl API
- *
- * Session Management Policy Control Service © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.512 V16.10.0; 5G System; Session Management Policy Control Service.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.512/
- *
- * API version: 1.1.6
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type SmPolicyTerminationNotification struct {
-	ResourceUri string                          `json:"resourceUri" yaml:"resourceUri" bson:"resourceUri,omitempty"`
-	Cause       SmPolicyAssociationReleaseCause `json:"cause" yaml:"cause" bson:"cause,omitempty"`
-}
diff --git a/models/model_sor_info.go b/models/model_sor_info.go
deleted file mode 100644
index 61a24a7a..00000000
--- a/models/model_sor_info.go
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Nudr_DataRepository API OpenAPI file
- *
- * Unified Data Repository Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.504 V16.9.0; 5G System; Unified Data Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.504/
- *
- * API version: 2.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-import (
-	"time"
-)
-
-type SorInfo struct {
-	SteeringContainer *SteeringContainer `json:"steeringContainer,omitempty" yaml:"steeringContainer" bson:"steeringContainer,omitempty"`
-	AckInd            bool               `json:"ackInd" yaml:"ackInd" bson:"ackInd,omitempty"`
-	SorMacIausf       string             `json:"sorMacIausf,omitempty" yaml:"sorMacIausf" bson:"sorMacIausf,omitempty"`
-	Countersor        string             `json:"countersor,omitempty" yaml:"countersor" bson:"countersor,omitempty"`
-	ProvisioningTime  *time.Time         `json:"provisioningTime" yaml:"provisioningTime" bson:"provisioningTime,omitempty"`
-}
diff --git a/models/model_steering_container.go b/models/model_steering_container.go
deleted file mode 100644
index d3a92c55..00000000
--- a/models/model_steering_container.go
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Nudr_DataRepository API OpenAPI file
- *
- * Unified Data Repository Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.504 V16.9.0; 5G System; Unified Data Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.504/
- *
- * API version: 2.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type SteeringContainer struct {
-}
diff --git a/models/model_steering_info.go b/models/model_steering_info.go
deleted file mode 100644
index 2c124498..00000000
--- a/models/model_steering_info.go
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Nudr_DataRepository API OpenAPI file
- *
- * Unified Data Repository Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.504 V16.9.0; 5G System; Unified Data Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.504/
- *
- * API version: 2.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type SteeringInfo struct {
-	PlmnId         *PlmnId      `json:"plmnId" yaml:"plmnId" bson:"plmnId,omitempty"`
-	AccessTechList []AccessTech `json:"accessTechList,omitempty" yaml:"accessTechList" bson:"accessTechList,omitempty"`
-}
diff --git a/models/model_subscription_data_sets.go b/models/model_subscription_data_sets.go
deleted file mode 100644
index 8da3902c..00000000
--- a/models/model_subscription_data_sets.go
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Nudr_DataRepository API OpenAPI file
- *
- * Unified Data Repository Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.504 V16.9.0; 5G System; Unified Data Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.504/
- *
- * API version: 2.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type SubscriptionDataSets struct {
-	AmData                          *AccessAndMobilitySubscriptionData  `json:"amData,omitempty" yaml:"amData" bson:"amData,omitempty"`
-	SmfSelData                      *SmfSelectionSubscriptionData       `json:"smfSelData,omitempty" yaml:"smfSelData" bson:"smfSelData,omitempty"`
-	UecAmfData                      *UeContextInAmfData                 `json:"uecAmfData,omitempty" yaml:"uecAmfData" bson:"uecAmfData,omitempty"`
-	UecSmfData                      *UeContextInSmfData                 `json:"uecSmfData,omitempty" yaml:"uecSmfData" bson:"uecSmfData,omitempty"`
-	UecSmsfData                     *UeContextInSmsfData                `json:"uecSmsfData,omitempty" yaml:"uecSmsfData" bson:"uecSmsfData,omitempty"`
-	SmsSubsData                     *SmsSubscriptionData                `json:"smsSubsData,omitempty" yaml:"smsSubsData" bson:"smsSubsData,omitempty"`
-	SmData                          []SessionManagementSubscriptionData `json:"smData,omitempty" yaml:"smData" bson:"smData,omitempty"`
-	TraceData                       *TraceData                          `json:"traceData,omitempty" yaml:"traceData" bson:"traceData,omitempty"`
-	SmsMngData                      *SmsManagementSubscriptionData      `json:"smsMngData,omitempty" yaml:"smsMngData" bson:"smsMngData,omitempty"`
-	LcsPrivacyData                  *LcsPrivacyData                     `json:"lcsPrivacyData,omitempty" yaml:"lcsPrivacyData" bson:"lcsPrivacyData,omitempty"`
-	LcsMoData                       *LcsMoData                          `json:"lcsMoData,omitempty" yaml:"lcsMoData" bson:"lcsMoData,omitempty"`
-	V2xData                         *V2xSubscriptionData                `json:"v2xData,omitempty" yaml:"v2xData" bson:"v2xData,omitempty"`
-	LcsBroadcastAssistanceTypesData *LcsBroadcastAssistanceTypesData    `json:"lcsBroadcastAssistanceTypesData,omitempty" yaml:"lcsBroadcastAssistanceTypesData" bson:"lcsBroadcastAssistanceTypesData,omitempty"`
-}
diff --git a/models/model_termination_cause.go b/models/model_termination_cause.go
deleted file mode 100644
index 2b35ad56..00000000
--- a/models/model_termination_cause.go
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Npcf_PolicyAuthorization Service API
- *
- * PCF Policy Authorization Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.514 V16.10.0; 5G System; Policy Authorization Service;Stage 3.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.514/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type TerminationCause string
-
-// List of TerminationCause
-const (
-	TerminationCause_ALL_SDF_DEACTIVATION    TerminationCause = "ALL_SDF_DEACTIVATION"
-	TerminationCause_PDU_SESSION_TERMINATION TerminationCause = "PDU_SESSION_TERMINATION"
-	TerminationCause_PS_TO_CS_HO             TerminationCause = "PS_TO_CS_HO"
-)
diff --git a/models/model_traffic_descriptor.go b/models/model_traffic_descriptor.go
deleted file mode 100644
index 93f965e0..00000000
--- a/models/model_traffic_descriptor.go
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Namf_EventExposure
- *
- * AMF Event Exposure Service © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.518 V16.9.0; 5G System; Access and Mobility Management Services
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.518/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type TrafficDescriptor struct {
-	Dnn                      string                 `json:"dnn,omitempty" yaml:"dnn" bson:"dnn,omitempty"`
-	SNssai                   *Snssai                `json:"sNssai,omitempty" yaml:"sNssai" bson:"sNssai,omitempty"`
-	DddTrafficDescriptorList []DddTrafficDescriptor `json:"dddTrafficDescriptorList,omitempty" yaml:"dddTrafficDescriptorList" bson:"dddTrafficDescriptorList,omitempty"`
-}
diff --git a/models/model_traffic_influ_sub_patch.go b/models/model_traffic_influ_sub_patch.go
deleted file mode 100644
index a7604b1d..00000000
--- a/models/model_traffic_influ_sub_patch.go
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 3gpp-traffic-influence
- *
- * API for AF traffic influence © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.522 V16.7.0; 5G System; Network Exposure Function Northbound APIs.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.522/
- *
- * API version: 1.1.2
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type TrafficInfluSubPatch struct {
-	// Identifies whether an application can be relocated once a location of the application has been selected.
-	AppReloInd bool `json:"appReloInd,omitempty" yaml:"appReloInd" bson:"appReloInd,omitempty"`
-	// Identifies IP packet filters.
-	TrafficFilters []*FlowInfo `json:"trafficFilters,omitempty" yaml:"trafficFilters" bson:"trafficFilters,omitempty"`
-	// Identifies Ethernet packet filters.
-	EthTrafficFilters []*EthFlowDescription `json:"ethTrafficFilters,omitempty" yaml:"ethTrafficFilters" bson:"ethTrafficFilters,omitempty"`
-	// Identifies the N6 traffic routing requirement.
-	TrafficRoutes  []RouteToLocation   `json:"trafficRoutes,omitempty" yaml:"trafficRoutes" bson:"trafficRoutes,omitempty"`
-	TfcCorrInd     bool                `json:"tfcCorrInd,omitempty" yaml:"tfcCorrInd" bson:"tfcCorrInd,omitempty"`
-	TempValidities []*TemporalValidity `json:"tempValidities,omitempty" yaml:"tempValidities" bson:"tempValidities,omitempty"`
-	// Identifies a geographic zone that the AF request applies only to the traffic of UE(s) located in this specific zone.
-	ValidGeoZoneIds []string `json:"validGeoZoneIds,omitempty" yaml:"validGeoZoneIds" bson:"validGeoZoneIds,omitempty"`
-	AfAckInd        bool     `json:"afAckInd,omitempty" yaml:"afAckInd" bson:"afAckInd,omitempty"`
-	AddrPreserInd   bool     `json:"addrPreserInd,omitempty" yaml:"addrPreserInd" bson:"addrPreserInd,omitempty"`
-}
diff --git a/models/model_transfer_policy.go b/models/model_transfer_policy.go
deleted file mode 100644
index f845dbfd..00000000
--- a/models/model_transfer_policy.go
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Nudr_DataRepository API OpenAPI file
- *
- * Unified Data Repository Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.504 V16.9.0; 5G System; Unified Data Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.504/
- *
- * API version: 2.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-// Describes a transfer policy.
-type TransferPolicy struct {
-	MaxBitRateDl string `json:"maxBitRateDl,omitempty" yaml:"maxBitRateDl" bson:"maxBitRateDl,omitempty"`
-	MaxBitRateUl string `json:"maxBitRateUl,omitempty" yaml:"maxBitRateUl" bson:"maxBitRateUl,omitempty"`
-	// Indicates a rating group for the recommended time window.
-	RatingGroup int32       `json:"ratingGroup" yaml:"ratingGroup" bson:"ratingGroup,omitempty"`
-	RecTimeInt  *TimeWindow `json:"recTimeInt" yaml:"recTimeInt" bson:"recTimeInt,omitempty"`
-	// Contains an identity of a transfer policy.
-	TransPolicyId int32 `json:"transPolicyId" yaml:"transPolicyId" bson:"transPolicyId,omitempty"`
-}
diff --git a/models/model_trigger.go b/models/model_trigger.go
deleted file mode 100644
index 8f38e24e..00000000
--- a/models/model_trigger.go
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Nsmf_PDUSession
- *
- * SMF PDU Session Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.502 V16.9.0; 5G System; Session Management Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.502/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-import (
-	"time"
-)
-
-type Trigger struct {
-	TriggerType      TriggerType     `json:"triggerType" yaml:"triggerType" bson:"triggerType,omitempty"`
-	TriggerCategory  TriggerCategory `json:"triggerCategory" yaml:"triggerCategory" bson:"triggerCategory,omitempty"`
-	TimeLimit        int32           `json:"timeLimit,omitempty" yaml:"timeLimit" bson:"timeLimit,omitempty"`
-	VolumeLimit      int32           `json:"volumeLimit,omitempty" yaml:"volumeLimit" bson:"volumeLimit,omitempty"`
-	VolumeLimit64    int32           `json:"volumeLimit64,omitempty" yaml:"volumeLimit64" bson:"volumeLimit64,omitempty"`
-	EventLimit       int32           `json:"eventLimit,omitempty" yaml:"eventLimit" bson:"eventLimit,omitempty"`
-	MaxNumberOfccc   int32           `json:"maxNumberOfccc,omitempty" yaml:"maxNumberOfccc" bson:"maxNumberOfccc,omitempty"`
-	TariffTimeChange *time.Time      `json:"tariffTimeChange,omitempty" yaml:"tariffTimeChange" bson:"tariffTimeChange,omitempty"`
-}
diff --git a/models/model_trigger_type.go b/models/model_trigger_type.go
deleted file mode 100644
index d97e05e4..00000000
--- a/models/model_trigger_type.go
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Nsmf_PDUSession
- *
- * SMF PDU Session Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.502 V16.9.0; 5G System; Session Management Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.502/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type TriggerType string
-
-// List of TriggerType
-const (
-	TriggerType_QUOTA_THRESHOLD                                  TriggerType = "QUOTA_THRESHOLD"
-	TriggerType_QHT                                              TriggerType = "QHT"
-	TriggerType_FINAL                                            TriggerType = "FINAL"
-	TriggerType_QUOTA_EXHAUSTED                                  TriggerType = "QUOTA_EXHAUSTED"
-	TriggerType_VALIDITY_TIME                                    TriggerType = "VALIDITY_TIME"
-	TriggerType_OTHER_QUOTA_TYPE                                 TriggerType = "OTHER_QUOTA_TYPE"
-	TriggerType_FORCED_REAUTHORISATION                           TriggerType = "FORCED_REAUTHORISATION"
-	TriggerType_UNUSED_QUOTA_TIMER                               TriggerType = "UNUSED_QUOTA_TIMER"
-	TriggerType_UNIT_COUNT_INACTIVITY_TIMER                      TriggerType = "UNIT_COUNT_INACTIVITY_TIMER"
-	TriggerType_ABNORMAL_RELEASE                                 TriggerType = "ABNORMAL_RELEASE"
-	TriggerType_QOS_CHANGE                                       TriggerType = "QOS_CHANGE"
-	TriggerType_VOLUME_LIMIT                                     TriggerType = "VOLUME_LIMIT"
-	TriggerType_TIME_LIMIT                                       TriggerType = "TIME_LIMIT"
-	TriggerType_EVENT_LIMIT                                      TriggerType = "EVENT_LIMIT"
-	TriggerType_PLMN_CHANGE                                      TriggerType = "PLMN_CHANGE"
-	TriggerType_USER_LOCATION_CHANGE                             TriggerType = "USER_LOCATION_CHANGE"
-	TriggerType_RAT_CHANGE                                       TriggerType = "RAT_CHANGE"
-	TriggerType_SESSION_AMBR_CHANGE                              TriggerType = "SESSION_AMBR_CHANGE"
-	TriggerType_UE_TIMEZONE_CHANGE                               TriggerType = "UE_TIMEZONE_CHANGE"
-	TriggerType_TARIFF_TIME_CHANGE                               TriggerType = "TARIFF_TIME_CHANGE"
-	TriggerType_MAX_NUMBER_OF_CHANGES_IN_CHARGING_CONDITIONS     TriggerType = "MAX_NUMBER_OF_CHANGES_IN_CHARGING_CONDITIONS"
-	TriggerType_MANAGEMENT_INTERVENTION                          TriggerType = "MANAGEMENT_INTERVENTION"
-	TriggerType_CHANGE_OF_UE_PRESENCE_IN_PRESENCE_REPORTING_AREA TriggerType = "CHANGE_OF_UE_PRESENCE_IN_PRESENCE_REPORTING_AREA"
-	TriggerType_CHANGE_OF_3_GPP_PS_DATA_OFF_STATUS               TriggerType = "CHANGE_OF_3GPP_PS_DATA_OFF_STATUS"
-	TriggerType_SERVING_NODE_CHANGE                              TriggerType = "SERVING_NODE_CHANGE"
-	TriggerType_REMOVAL_OF_UPF                                   TriggerType = "REMOVAL_OF_UPF"
-	TriggerType_ADDITION_OF_UPF                                  TriggerType = "ADDITION_OF_UPF"
-	TriggerType_INSERTION_OF_ISMF                                TriggerType = "INSERTION_OF_ISMF"
-	TriggerType_REMOVAL_OF_ISMF                                  TriggerType = "REMOVAL_OF_ISMF"
-	TriggerType_CHANGE_OF_ISMF                                   TriggerType = "CHANGE_OF_ISMF"
-	TriggerType_START_OF_SERVICE_DATA_FLOW                       TriggerType = "START_OF_SERVICE_DATA_FLOW"
-	TriggerType_ECGI_CHANGE                                      TriggerType = "ECGI_CHANGE"
-	TriggerType_TAI_CHANGE                                       TriggerType = "TAI_CHANGE"
-	TriggerType_HANDOVER_CANCEL                                  TriggerType = "HANDOVER_CANCEL"
-	TriggerType_HANDOVER_START                                   TriggerType = "HANDOVER_START"
-	TriggerType_HANDOVER_COMPLETE                                TriggerType = "HANDOVER_COMPLETE"
-	TriggerType_GFBR_GUARANTEED_STATUS_CHANGE                    TriggerType = "GFBR_GUARANTEED_STATUS_CHANGE"
-	TriggerType_ADDITION_OF_ACCESS                               TriggerType = "ADDITION_OF_ACCESS"
-	TriggerType_REMOVAL_OF_ACCESS                                TriggerType = "REMOVAL_OF_ACCESS"
-	TriggerType_START_OF_SDF_ADDITIONAL_ACCESS                   TriggerType = "START_OF_SDF_ADDITIONAL_ACCESS"
-)
diff --git a/models/model_ue_id.go b/models/model_ue_id.go
deleted file mode 100644
index 2c4b3da1..00000000
--- a/models/model_ue_id.go
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Nudr_DataRepository API OpenAPI file
- *
- * Unified Data Repository Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.504 V16.9.0; 5G System; Unified Data Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.504/
- *
- * API version: 2.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type UeId struct {
-	Supi     string   `json:"supi" yaml:"supi" bson:"supi,omitempty"`
-	GpsiList []string `json:"gpsiList,omitempty" yaml:"gpsiList" bson:"gpsiList,omitempty"`
-}
diff --git a/models/model_ue_policy_association.go b/models/model_ue_policy_association.go
deleted file mode 100644
index f9624eb9..00000000
--- a/models/model_ue_policy_association.go
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Npcf_UEPolicyControl
- *
- * UE Policy Control Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.525 V16.9.0; 5G System; UE Policy Control Service.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.525/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type UePolicyAssociation struct {
-	Request  *UePolicyAssociationRequest `json:"request,omitempty" yaml:"request" bson:"request,omitempty"`
-	UePolicy string                      `json:"uePolicy,omitempty" yaml:"uePolicy" bson:"uePolicy,omitempty"`
-	N2Pc5Pol *N2InfoContent              `json:"n2Pc5Pol,omitempty" yaml:"n2Pc5Pol" bson:"n2Pc5Pol,omitempty"`
-	// Request Triggers that the PCF subscribes. Only values \"LOC_CH\" and \"PRA_CH\" are permitted.
-	Triggers []UePolicyRequestTrigger `json:"triggers,omitempty" yaml:"triggers" bson:"triggers,omitempty"`
-	Pras     map[string]PresenceInfo  `json:"pras,omitempty" yaml:"pras" bson:"pras,omitempty"`
-	SuppFeat string                   `json:"suppFeat" yaml:"suppFeat" bson:"suppFeat,omitempty"`
-}
diff --git a/models/model_ue_policy_association_release_cause.go b/models/model_ue_policy_association_release_cause.go
deleted file mode 100644
index a6f991c8..00000000
--- a/models/model_ue_policy_association_release_cause.go
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Npcf_UEPolicyControl
- *
- * UE Policy Control Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.525 V16.9.0; 5G System; UE Policy Control Service.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.525/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type UePolicyAssociationReleaseCause string
-
-// List of UePolicyAssociationReleaseCause
-const (
-	UePolicyAssociationReleaseCause_UNSPECIFIED      UePolicyAssociationReleaseCause = "UNSPECIFIED"
-	UePolicyAssociationReleaseCause_UE_SUBSCRIPTION  UePolicyAssociationReleaseCause = "UE_SUBSCRIPTION"
-	UePolicyAssociationReleaseCause_INSUFFICIENT_RES UePolicyAssociationReleaseCause = "INSUFFICIENT_RES"
-)
diff --git a/models/model_ue_policy_association_request.go b/models/model_ue_policy_association_request.go
deleted file mode 100644
index 2bdf5301..00000000
--- a/models/model_ue_policy_association_request.go
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Npcf_UEPolicyControl
- *
- * UE Policy Control Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.525 V16.9.0; 5G System; UE Policy Control Service.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.525/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type UePolicyAssociationRequest struct {
-	NotificationUri string `json:"notificationUri" yaml:"notificationUri" bson:"notificationUri,omitempty"`
-	// Alternate or backup IPv4 Address(es) where to send Notifications.
-	AltNotifIpv4Addrs []string `json:"altNotifIpv4Addrs,omitempty" yaml:"altNotifIpv4Addrs" bson:"altNotifIpv4Addrs,omitempty"`
-	// Alternate or backup IPv6 Address(es) where to send Notifications.
-	AltNotifIpv6Addrs []string `json:"altNotifIpv6Addrs,omitempty" yaml:"altNotifIpv6Addrs" bson:"altNotifIpv6Addrs,omitempty"`
-	// Alternate or backup FQDN(s) where to send Notifications.
-	AltNotifFqdns []string      `json:"altNotifFqdns,omitempty" yaml:"altNotifFqdns" bson:"altNotifFqdns,omitempty"`
-	Supi          string        `json:"supi" yaml:"supi" bson:"supi,omitempty"`
-	Gpsi          string        `json:"gpsi,omitempty" yaml:"gpsi" bson:"gpsi,omitempty"`
-	AccessType    AccessType    `json:"accessType,omitempty" yaml:"accessType" bson:"accessType,omitempty"`
-	Pei           string        `json:"pei,omitempty" yaml:"pei" bson:"pei,omitempty"`
-	UserLoc       *UserLocation `json:"userLoc,omitempty" yaml:"userLoc" bson:"userLoc,omitempty"`
-	TimeZone      string        `json:"timeZone,omitempty" yaml:"timeZone" bson:"timeZone,omitempty"`
-	ServingPlmn   *PlmnIdNid    `json:"servingPlmn,omitempty" yaml:"servingPlmn" bson:"servingPlmn,omitempty"`
-	RatType       RatType       `json:"ratType,omitempty" yaml:"ratType" bson:"ratType,omitempty"`
-	GroupIds      []string      `json:"groupIds,omitempty" yaml:"groupIds" bson:"groupIds,omitempty"`
-	HPcfId        string        `json:"hPcfId,omitempty" yaml:"hPcfId" bson:"hPcfId,omitempty"`
-	UePolReq      string        `json:"uePolReq,omitempty" yaml:"uePolReq" bson:"uePolReq,omitempty"`
-	Guami         *Guami        `json:"guami,omitempty" yaml:"guami" bson:"guami,omitempty"`
-	ServiceName   ServiceName   `json:"serviceName,omitempty" yaml:"serviceName" bson:"serviceName,omitempty"`
-	ServingNfId   string        `json:"servingNfId,omitempty" yaml:"servingNfId" bson:"servingNfId,omitempty"`
-	Pc5Capab      Pc5Capability `json:"pc5Capab,omitempty" yaml:"pc5Capab" bson:"pc5Capab,omitempty"`
-	SuppFeat      string        `json:"suppFeat" yaml:"suppFeat" bson:"suppFeat,omitempty"`
-}
diff --git a/models/model_ue_policy_association_update_request.go b/models/model_ue_policy_association_update_request.go
deleted file mode 100644
index f2245897..00000000
--- a/models/model_ue_policy_association_update_request.go
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Npcf_UEPolicyControl
- *
- * UE Policy Control Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.525 V16.9.0; 5G System; UE Policy Control Service.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.525/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type UePolicyAssociationUpdateRequest struct {
-	NotificationUri string `json:"notificationUri,omitempty" yaml:"notificationUri" bson:"notificationUri,omitempty"`
-	// Alternate or backup IPv4 Address(es) where to send Notifications.
-	AltNotifIpv4Addrs []string `json:"altNotifIpv4Addrs,omitempty" yaml:"altNotifIpv4Addrs" bson:"altNotifIpv4Addrs,omitempty"`
-	// Alternate or backup IPv6 Address(es) where to send Notifications.
-	AltNotifIpv6Addrs []string `json:"altNotifIpv6Addrs,omitempty" yaml:"altNotifIpv6Addrs" bson:"altNotifIpv6Addrs,omitempty"`
-	// Alternate or backup FQDN(s) where to send Notifications.
-	AltNotifFqdns []string `json:"altNotifFqdns,omitempty" yaml:"altNotifFqdns" bson:"altNotifFqdns,omitempty"`
-	// Request Triggers that the NF service consumer observes.
-	Triggers []UePolicyRequestTrigger `json:"triggers,omitempty" yaml:"triggers" bson:"triggers,omitempty"`
-	// Map of PRA status information.
-	PraStatuses         map[string]PresenceInfo              `json:"praStatuses,omitempty" yaml:"praStatuses" bson:"praStatuses,omitempty"`
-	UserLoc             *UserLocation                        `json:"userLoc,omitempty" yaml:"userLoc" bson:"userLoc,omitempty"`
-	UePolDelResult      string                               `json:"uePolDelResult,omitempty" yaml:"uePolDelResult" bson:"uePolDelResult,omitempty"`
-	UePolTransFailNotif *UePolicyTransferFailureNotification `json:"uePolTransFailNotif,omitempty" yaml:"uePolTransFailNotif" bson:"uePolTransFailNotif,omitempty"`
-	UePolReq            string                               `json:"uePolReq,omitempty" yaml:"uePolReq" bson:"uePolReq,omitempty"`
-	Guami               *Guami                               `json:"guami,omitempty" yaml:"guami" bson:"guami,omitempty"`
-	ServingNfId         string                               `json:"servingNfId,omitempty" yaml:"servingNfId" bson:"servingNfId,omitempty"`
-	PlmnId              *PlmnId                              `json:"plmnId,omitempty" yaml:"plmnId" bson:"plmnId,omitempty"`
-	ConnectState        CmState                              `json:"connectState,omitempty" yaml:"connectState" bson:"connectState,omitempty"`
-	GroupIds            []string                             `json:"groupIds,omitempty" yaml:"groupIds" bson:"groupIds,omitempty"`
-}
diff --git a/models/model_ue_policy_request_trigger.go b/models/model_ue_policy_request_trigger.go
deleted file mode 100644
index 15a7d795..00000000
--- a/models/model_ue_policy_request_trigger.go
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Npcf_UEPolicyControl
- *
- * UE Policy Control Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.525 V16.9.0; 5G System; UE Policy Control Service.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.525/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type UePolicyRequestTrigger string
-
-// List of UePolicyRequestTrigger
-const (
-	UePolicyRequestTrigger_LOC_CH            UePolicyRequestTrigger = "LOC_CH"
-	UePolicyRequestTrigger_PRA_CH            UePolicyRequestTrigger = "PRA_CH"
-	UePolicyRequestTrigger_UE_POLICY         UePolicyRequestTrigger = "UE_POLICY"
-	UePolicyRequestTrigger_PLMN_CH           UePolicyRequestTrigger = "PLMN_CH"
-	UePolicyRequestTrigger_CON_STATE_CH      UePolicyRequestTrigger = "CON_STATE_CH"
-	UePolicyRequestTrigger_GROUP_ID_LIST_CHG UePolicyRequestTrigger = "GROUP_ID_LIST_CHG"
-)
diff --git a/models/model_ue_policy_termination_notification.go b/models/model_ue_policy_termination_notification.go
deleted file mode 100644
index efdae835..00000000
--- a/models/model_ue_policy_termination_notification.go
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Npcf_UEPolicyControl
- *
- * UE Policy Control Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.525 V16.9.0; 5G System; UE Policy Control Service.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.525/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type UePolicyTerminationNotification struct {
-	ResourceUri string                          `json:"resourceUri" yaml:"resourceUri" bson:"resourceUri,omitempty"`
-	Cause       UePolicyAssociationReleaseCause `json:"cause" yaml:"cause" bson:"cause,omitempty"`
-}
diff --git a/models/model_ue_policy_update.go b/models/model_ue_policy_update.go
deleted file mode 100644
index 616d6e74..00000000
--- a/models/model_ue_policy_update.go
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Npcf_UEPolicyControl
- *
- * UE Policy Control Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.525 V16.9.0; 5G System; UE Policy Control Service.
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.525/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type UePolicyUpdate struct {
-	ResourceUri string         `json:"resourceUri" yaml:"resourceUri" bson:"resourceUri,omitempty"`
-	UePolicy    string         `json:"uePolicy,omitempty" yaml:"uePolicy" bson:"uePolicy,omitempty"`
-	N2Pc5Pol    *N2InfoContent `json:"n2Pc5Pol,omitempty" yaml:"n2Pc5Pol" bson:"n2Pc5Pol,omitempty"`
-	// Request Triggers that the PCF subscribes. Only values \"LOC_CH\" and \"PRA_CH\" are permitted.
-	Triggers []UePolicyRequestTrigger `json:"triggers,omitempty" yaml:"triggers" bson:"triggers,omitempty"`
-	// Map of PRA information.
-	Pras map[string]PresenceInfo `json:"pras,omitempty" yaml:"pras" bson:"pras,omitempty"`
-}
diff --git a/models/model_update_sm_context_error.go b/models/model_update_sm_context_error.go
deleted file mode 100644
index 1c85b5a0..00000000
--- a/models/model_update_sm_context_error.go
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Nsmf_PDUSession
- *
- * SMF PDU Session Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.502 V16.9.0; 5G System; Session Management Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.502/
- *
- * API version: 1.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type UpdateSmContextError struct {
-	JsonData                  *SmContextUpdateError `json:"jsonData,omitempty" yaml:"jsonData" bson:"jsonData" multipart:"contentType:application/json,omitempty"`
-	BinaryDataN1SmMessage     []byte                `json:"binaryDataN1SmMessage,omitempty" yaml:"binaryDataN1SmMessage" bson:"binaryDataN1SmMessage" multipart:"contentType:application/vnd.3gpp.5gnas,ref:JsonData.N1SmMsg.ContentId,omitempty"`
-	BinaryDataN2SmInformation []byte                `json:"binaryDataN2SmInformation,omitempty" yaml:"binaryDataN2SmInformation" bson:"binaryDataN2SmInformation" multipart:"contentType:application/vnd.3gpp.ngap,ref:JsonData.N2SmInfo.ContentId,omitempty"`
-}
diff --git a/models/model_upu_data_1.go b/models/model_upu_data_1.go
deleted file mode 100644
index 8835377b..00000000
--- a/models/model_upu_data_1.go
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Nudr_DataRepository API OpenAPI file
- *
- * Unified Data Repository Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.504 V16.9.0; 5G System; Unified Data Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.504/
- *
- * API version: 2.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type UpuData1 struct {
-	SecPacket        string   `json:"secPacket,omitempty" yaml:"secPacket" bson:"secPacket,omitempty"`
-	DefaultConfNssai []Snssai `json:"defaultConfNssai,omitempty" yaml:"defaultConfNssai" bson:"defaultConfNssai,omitempty"`
-	RoutingId        string   `json:"routingId,omitempty" yaml:"routingId" bson:"routingId,omitempty"`
-}
diff --git a/models/model_upu_info.go b/models/model_upu_info.go
deleted file mode 100644
index cc7bec2f..00000000
--- a/models/model_upu_info.go
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Nudr_DataRepository API OpenAPI file
- *
- * Unified Data Repository Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.504 V16.9.0; 5G System; Unified Data Repository Services; Stage 3
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.504/
- *
- * API version: 2.1.5
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-import (
-	"time"
-)
-
-type UpuInfo struct {
-	UpuDataList      []UpuData1 `json:"upuDataList" yaml:"upuDataList" bson:"upuDataList,omitempty"`
-	UpuRegInd        bool       `json:"upuRegInd" yaml:"upuRegInd" bson:"upuRegInd,omitempty"`
-	UpuAckInd        bool       `json:"upuAckInd" yaml:"upuAckInd" bson:"upuAckInd,omitempty"`
-	UpuMacIausf      string     `json:"upuMacIausf,omitempty" yaml:"upuMacIausf" bson:"upuMacIausf,omitempty"`
-	CounterUpu       string     `json:"counterUpu,omitempty" yaml:"counterUpu" bson:"counterUpu,omitempty"`
-	ProvisioningTime *time.Time `json:"provisioningTime" yaml:"provisioningTime" bson:"provisioningTime,omitempty"`
-}
diff --git a/models/model_user_plane_location_area.go b/models/model_user_plane_location_area.go
deleted file mode 100644
index 68287ec9..00000000
--- a/models/model_user_plane_location_area.go
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * 3gpp-pfd-management
- *
- * API for PFD management. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.122 V16.9.0 T8 reference point for Northbound APIs
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.122/
- *
- * API version: 1.1.1
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type UserPlaneLocationArea struct {
-	LocationArea   *AFLocationArea   `json:"locationArea,omitempty" yaml:"locationArea" bson:"locationArea"`
-	LocationArea5G *AFLocationArea5G `json:"locationArea5G,omitempty" yaml:"locationArea5G" bson:"locationArea5G"`
-	// Identifies a list of DNAI which the user plane functions support.
-	Dnais []string `json:"dnais,omitempty" yaml:"dnais" bson:"dnais"`
-}
diff --git a/models/pfd_failure_code.go b/models/pfd_failure_code.go
deleted file mode 100644
index df2d9a9e..00000000
--- a/models/pfd_failure_code.go
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 3gpp-pfd-management
- *
- * API for PFD management. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.122 V16.9.0 T8 reference point for Northbound APIs
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.122/
- *
- * API version: 1.1.1
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type PFDFailureCode string
-
-// List of FailureCode
-const (
-	FailureCode_MALFUNCTION         FailureCode = "MALFUNCTION"
-	FailureCode_RESOURCE_LIMITATION FailureCode = "RESOURCE_LIMITATION"
-	FailureCode_SHORT_DELAY         FailureCode = "SHORT_DELAY"
-	FailureCode_APP_ID_DUPLICATED   FailureCode = "APP_ID_DUPLICATED"
-	FailureCode_PARTIAL_FAILURE     FailureCode = "PARTIAL_FAILURE"
-	FailureCode_OTHER_REASON        FailureCode = "OTHER_REASON"
-)

From c358ff0eeb6b0af9df331815f4ea73eb556ed26d Mon Sep 17 00:00:00 2001
From: "CTFang@WireLab" <ctfang.cs12@nycu.edu.tw>
Date: Tue, 16 Jul 2024 03:24:54 +0000
Subject: [PATCH 2/4] fix: remove r16 models and fix type error

---
 models/model_authentication_info_result.go    | 20 --------------
 models/model_created_ee_subscription.go       | 20 --------------
 models/model_monitoring_report.go             | 26 -------------------
 ...el_nrf_access_token_access_token_claims.go |  3 +++
 models/model_reachability_for_sms_report.go   | 22 ----------------
 .../model_sip_authentication_info_result.go   | 12 ++++-----
 oauth/oauth.go                                |  4 +--
 7 files changed, 10 insertions(+), 97 deletions(-)
 delete mode 100644 models/model_authentication_info_result.go
 delete mode 100644 models/model_created_ee_subscription.go
 delete mode 100644 models/model_monitoring_report.go
 delete mode 100644 models/model_reachability_for_sms_report.go

diff --git a/models/model_authentication_info_result.go b/models/model_authentication_info_result.go
deleted file mode 100644
index bbea25bc..00000000
--- a/models/model_authentication_info_result.go
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Nudm_UEAU
- *
- * UDM UE Authentication Service. © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.503 Unified Data Management Services, version 16.6.0
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.503/
- *
- * API version: 1.1.2
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type AuthenticationInfoResult struct {
-	AuthType             AuthType              `json:"authType" yaml:"authType" bson:"authType,omitempty"`
-	SupportedFeatures    string                `json:"supportedFeatures,omitempty" yaml:"supportedFeatures" bson:"supportedFeatures,omitempty"`
-	AuthenticationVector *AuthenticationVector `json:"authenticationVector,omitempty" yaml:"authenticationVector" bson:"authenticationVector,omitempty"`
-	Supi                 string                `json:"supi,omitempty" yaml:"supi" bson:"supi,omitempty"`
-}
diff --git a/models/model_created_ee_subscription.go b/models/model_created_ee_subscription.go
deleted file mode 100644
index b1bbe7ca..00000000
--- a/models/model_created_ee_subscription.go
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Nudm_EE
- *
- * Nudm Event Exposure Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.503 Unified Data Management Services, version 16.9.0
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.503/
- *
- * API version: 1.1.2
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-type CreatedEeSubscription struct {
-	EeSubscription *EeSubscription    `json:"eeSubscription" yaml:"eeSubscription" bson:"eeSubscription,omitempty"`
-	NumberOfUes    int32              `json:"numberOfUes,omitempty" yaml:"numberOfUes" bson:"numberOfUes,omitempty"`
-	EventReports   []MonitoringReport `json:"eventReports,omitempty" yaml:"eventReports" bson:"eventReports,omitempty"`
-	EpcStatusInd   bool               `json:"epcStatusInd,omitempty" yaml:"epcStatusInd" bson:"epcStatusInd,omitempty"`
-}
diff --git a/models/model_monitoring_report.go b/models/model_monitoring_report.go
deleted file mode 100644
index 9503ad12..00000000
--- a/models/model_monitoring_report.go
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Nudm_EE
- *
- * Nudm Event Exposure Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.503 Unified Data Management Services, version 16.9.0
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.503/
- *
- * API version: 1.1.2
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-import (
-	"time"
-)
-
-type MonitoringReport struct {
-	ReferenceId              int32                     `json:"referenceId" yaml:"referenceId" bson:"referenceId,omitempty"`
-	EventType                EventType                 `json:"eventType" yaml:"eventType" bson:"eventType,omitempty"`
-	Report                   *Report                   `json:"report,omitempty" yaml:"report" bson:"report,omitempty"`
-	ReachabilityForSmsReport *ReachabilityForSmsReport `json:"reachabilityForSmsReport,omitempty" yaml:"reachabilityForSmsReport" bson:"reachabilityForSmsReport,omitempty"`
-	Gpsi                     string                    `json:"gpsi,omitempty" yaml:"gpsi" bson:"gpsi,omitempty"`
-	TimeStamp                *time.Time                `json:"timeStamp" yaml:"timeStamp" bson:"timeStamp,omitempty"`
-}
diff --git a/models/model_nrf_access_token_access_token_claims.go b/models/model_nrf_access_token_access_token_claims.go
index 663af312..76c9a3ab 100644
--- a/models/model_nrf_access_token_access_token_claims.go
+++ b/models/model_nrf_access_token_access_token_claims.go
@@ -12,6 +12,8 @@
 
 package models
 
+import "github.com/golang-jwt/jwt"
+
 // The claims data structure for the access token
 type NrfAccessTokenAccessTokenClaims struct {
 	// String uniquely identifying a NF instance. The format of the NF Instance ID shall be a  Universally Unique Identifier (UUID) version 4, as described in IETF RFC 4122.
@@ -33,4 +35,5 @@ type NrfAccessTokenAccessTokenClaims struct {
 	ProducerNfServiceSetId string `json:"producerNfServiceSetId,omitempty" yaml:"producerNfServiceSetId" bson:"producerNfServiceSetId,omitempty"`
 	// String uniquely identifying a NF instance. The format of the NF Instance ID shall be a  Universally Unique Identifier (UUID) version 4, as described in IETF RFC 4122.
 	SourceNfInstanceId string `json:"sourceNfInstanceId,omitempty" yaml:"sourceNfInstanceId" bson:"sourceNfInstanceId,omitempty"`
+	jwt.StandardClaims
 }
diff --git a/models/model_reachability_for_sms_report.go b/models/model_reachability_for_sms_report.go
deleted file mode 100644
index 7a5e3443..00000000
--- a/models/model_reachability_for_sms_report.go
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Nudm_EE
- *
- * Nudm Event Exposure Service. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
- *
- * Source file: 3GPP TS 29.503 Unified Data Management Services, version 16.9.0
- * Url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.503/
- *
- * API version: 1.1.2
- * Generated by: OpenAPI Generator (https://openapi-generator.tech)
- */
-
-package models
-
-import (
-	"time"
-)
-
-type ReachabilityForSmsReport struct {
-	SmsfAccessType      AccessType `json:"smsfAccessType" yaml:"smsfAccessType" bson:"smsfAccessType,omitempty"`
-	MaxAvailabilityTime *time.Time `json:"maxAvailabilityTime,omitempty" yaml:"maxAvailabilityTime" bson:"maxAvailabilityTime,omitempty"`
-}
diff --git a/models/model_sip_authentication_info_result.go b/models/model_sip_authentication_info_result.go
index adef34fc..9e9fd201 100644
--- a/models/model_sip_authentication_info_result.go
+++ b/models/model_sip_authentication_info_result.go
@@ -12,12 +12,10 @@
 
 package models
 
-
-
 type SipAuthenticationInfoResult struct {
-	Impi string `json:"impi" yaml:"impi" bson:"impi"`
-	Var3gAkaAvs []*Model3GAkaAv `json:"3gAkaAvs,omitempty" yaml:"3gAkaAvs" bson:"3gAkaAvs"`
-	DigestAuth *DigestAuthentication `json:"digestAuth,omitempty" yaml:"digestAuth" bson:"digestAuth"`
-	LineIdentifierList []string `json:"lineIdentifierList,omitempty" yaml:"lineIdentifierList" bson:"lineIdentifierList"`
-	IpAddress *IpAddress `json:"ipAddress,omitempty" yaml:"ipAddress" bson:"ipAddress"`
+	Impi               string                `json:"impi" yaml:"impi" bson:"impi"`
+	Var3gAkaAvs        []*Model3GAkaAv       `json:"3gAkaAvs,omitempty" yaml:"3gAkaAvs" bson:"3gAkaAvs"`
+	DigestAuth         *DigestAuthentication `json:"digestAuth,omitempty" yaml:"digestAuth" bson:"digestAuth"`
+	LineIdentifierList []string              `json:"lineIdentifierList,omitempty" yaml:"lineIdentifierList" bson:"lineIdentifierList"`
+	IpAddress          *IpAddr               `json:"ipAddress,omitempty" yaml:"ipAddress" bson:"ipAddress"`
 }
diff --git a/oauth/oauth.go b/oauth/oauth.go
index 66f7309d..2dabc534 100644
--- a/oauth/oauth.go
+++ b/oauth/oauth.go
@@ -70,7 +70,7 @@ func VerifyOAuth(
 	access_token := auth_fields[1]
 	token, err := jwt.ParseWithClaims(
 		access_token,
-		&models.AccessTokenClaims{},
+		&models.NrfAccessTokenAccessTokenClaims{},
 		func(token *jwt.Token) (interface{}, error) {
 			if _, ok := token.Method.(*jwt.SigningMethodRSA); !ok {
 				return nil, errors.Wrapf(err, "Unexpected signing method")
@@ -84,7 +84,7 @@ func VerifyOAuth(
 		return errors.Wrapf(err, "verify OAuth parse")
 	}
 
-	if !verifyScope(token.Claims.(*models.AccessTokenClaims).Scope, serviceName) {
+	if !verifyScope(token.Claims.(*models.NrfAccessTokenAccessTokenClaims).Scope, serviceName) {
 		return errors.Wrapf(err, "verify OAuth scope")
 	}
 	return nil

From f8c907cee3a417e773a4be7e1367bc203df23681 Mon Sep 17 00:00:00 2001
From: "CTFang@WireLab" <ctfang.cs12@nycu.edu.tw>
Date: Thu, 1 Aug 2024 03:29:59 +0000
Subject: [PATCH 3/4] fix: jwt version update

---
 models/model_nrf_access_token_access_token_claims.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/models/model_nrf_access_token_access_token_claims.go b/models/model_nrf_access_token_access_token_claims.go
index 76c9a3ab..11069481 100644
--- a/models/model_nrf_access_token_access_token_claims.go
+++ b/models/model_nrf_access_token_access_token_claims.go
@@ -12,7 +12,7 @@
 
 package models
 
-import "github.com/golang-jwt/jwt"
+import "github.com/golang-jwt/jwt/v5"
 
 // The claims data structure for the access token
 type NrfAccessTokenAccessTokenClaims struct {
@@ -35,5 +35,5 @@ type NrfAccessTokenAccessTokenClaims struct {
 	ProducerNfServiceSetId string `json:"producerNfServiceSetId,omitempty" yaml:"producerNfServiceSetId" bson:"producerNfServiceSetId,omitempty"`
 	// String uniquely identifying a NF instance. The format of the NF Instance ID shall be a  Universally Unique Identifier (UUID) version 4, as described in IETF RFC 4122.
 	SourceNfInstanceId string `json:"sourceNfInstanceId,omitempty" yaml:"sourceNfInstanceId" bson:"sourceNfInstanceId,omitempty"`
-	jwt.StandardClaims
+	jwt.RegisteredClaims
 }

From 248f34d5b6b2c3e1e5564c7b66705262d483eaaa Mon Sep 17 00:00:00 2001
From: pf-lin <welin9211@gmail.com>
Date: Wed, 7 Aug 2024 08:34:04 +0000
Subject: [PATCH 4/4] fix: remove redundant underscores

---
 models/model_rule_operation.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/models/model_rule_operation.go b/models/model_rule_operation.go
index 7db32391..cac68832 100644
--- a/models/model_rule_operation.go
+++ b/models/model_rule_operation.go
@@ -19,7 +19,7 @@ const (
 	RuleOperation_CREATE_PCC_RULE                               RuleOperation = "CREATE_PCC_RULE"
 	RuleOperation_DELETE_PCC_RULE                               RuleOperation = "DELETE_PCC_RULE"
 	RuleOperation_MODIFY_PCC_RULE_AND_ADD_PACKET_FILTERS        RuleOperation = "MODIFY_PCC_RULE_AND_ADD_PACKET_FILTERS"
-	RuleOperation_MODIFY__PCC_RULE_AND_REPLACE_PACKET_FILTERS   RuleOperation = "MODIFY_ PCC_RULE_AND_REPLACE_PACKET_FILTERS"
-	RuleOperation_MODIFY__PCC_RULE_AND_DELETE_PACKET_FILTERS    RuleOperation = "MODIFY_ PCC_RULE_AND_DELETE_PACKET_FILTERS"
+	RuleOperation_MODIFY_PCC_RULE_AND_REPLACE_PACKET_FILTERS   RuleOperation = "MODIFY_PCC_RULE_AND_REPLACE_PACKET_FILTERS"
+	RuleOperation_MODIFY_PCC_RULE_AND_DELETE_PACKET_FILTERS    RuleOperation = "MODIFY_PCC_RULE_AND_DELETE_PACKET_FILTERS"
 	RuleOperation_MODIFY_PCC_RULE_WITHOUT_MODIFY_PACKET_FILTERS RuleOperation = "MODIFY_PCC_RULE_WITHOUT_MODIFY_PACKET_FILTERS"
 )