diff --git a/api/client/cluster/get_ssh_key_pair_parameters.go b/api/client/cluster/get_ssh_key_pair_parameters.go
index db6edaeb..c0c2e39c 100644
--- a/api/client/cluster/get_ssh_key_pair_parameters.go
+++ b/api/client/cluster/get_ssh_key_pair_parameters.go
@@ -14,8 +14,6 @@ import (
 	"github.com/go-openapi/runtime"
 	cr "github.com/go-openapi/runtime/client"
 	"github.com/go-openapi/strfmt"
-
-	"github.com/fi-ts/cloud-go/api/models"
 )
 
 // NewGetSSHKeyPairParams creates a new GetSSHKeyPairParams object,
@@ -63,9 +61,6 @@ GetSSHKeyPairParams contains all the parameters to send to the API endpoint
 */
 type GetSSHKeyPairParams struct {
 
-	// Body.
-	Body *models.V1ClusterCredentialsRequest
-
 	/* ID.
 
 	   identifier of the cluster
@@ -125,17 +120,6 @@ func (o *GetSSHKeyPairParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
-// WithBody adds the body to the get SSH key pair params
-func (o *GetSSHKeyPairParams) WithBody(body *models.V1ClusterCredentialsRequest) *GetSSHKeyPairParams {
-	o.SetBody(body)
-	return o
-}
-
-// SetBody adds the body to the get SSH key pair params
-func (o *GetSSHKeyPairParams) SetBody(body *models.V1ClusterCredentialsRequest) {
-	o.Body = body
-}
-
 // WithID adds the id to the get SSH key pair params
 func (o *GetSSHKeyPairParams) WithID(id string) *GetSSHKeyPairParams {
 	o.SetID(id)
@@ -154,11 +138,6 @@ func (o *GetSSHKeyPairParams) WriteToRequest(r runtime.ClientRequest, reg strfmt
 		return err
 	}
 	var res []error
-	if o.Body != nil {
-		if err := r.SetBodyParam(o.Body); err != nil {
-			return err
-		}
-	}
 
 	// path param id
 	if err := r.SetPathParam("id", o.ID); err != nil {
diff --git a/api/models/v1_cluster_credentials_request.go b/api/models/v1_cluster_credentials_request.go
deleted file mode 100644
index 5deefb23..00000000
--- a/api/models/v1_cluster_credentials_request.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-	"github.com/go-openapi/validate"
-)
-
-// V1ClusterCredentialsRequest v1 cluster credentials request
-//
-// swagger:model v1.ClusterCredentialsRequest
-type V1ClusterCredentialsRequest struct {
-
-	// if set to true, returning vpn credentials are omitted, the reason does not need to provided
-	Omitvpn bool `json:"omitvpn,omitempty"`
-
-	// reason why the vpn key is requested, typically an incident number with short description
-	// Required: true
-	Reason *string `json:"reason"`
-}
-
-// Validate validates this v1 cluster credentials request
-func (m *V1ClusterCredentialsRequest) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateReason(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *V1ClusterCredentialsRequest) validateReason(formats strfmt.Registry) error {
-
-	if err := validate.Required("reason", "body", m.Reason); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// ContextValidate validates this v1 cluster credentials request based on context it is used
-func (m *V1ClusterCredentialsRequest) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *V1ClusterCredentialsRequest) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *V1ClusterCredentialsRequest) UnmarshalBinary(b []byte) error {
-	var res V1ClusterCredentialsRequest
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
diff --git a/api/models/v1_s3_partition_response.go b/api/models/v1_s3_partition_response.go
index e25d4be5..6759fcc3 100644
--- a/api/models/v1_s3_partition_response.go
+++ b/api/models/v1_s3_partition_response.go
@@ -19,14 +19,6 @@ import (
 // swagger:model v1.S3PartitionResponse
 type V1S3PartitionResponse struct {
 
-	// classification
-	// Required: true
-	Classification *string `json:"classification"`
-
-	// description
-	// Required: true
-	Description *string `json:"description"`
-
 	// endpoint
 	// Required: true
 	Endpoint *string `json:"endpoint"`
@@ -44,14 +36,6 @@ type V1S3PartitionResponse struct {
 func (m *V1S3PartitionResponse) Validate(formats strfmt.Registry) error {
 	var res []error
 
-	if err := m.validateClassification(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateDescription(formats); err != nil {
-		res = append(res, err)
-	}
-
 	if err := m.validateEndpoint(formats); err != nil {
 		res = append(res, err)
 	}
@@ -70,24 +54,6 @@ func (m *V1S3PartitionResponse) Validate(formats strfmt.Registry) error {
 	return nil
 }
 
-func (m *V1S3PartitionResponse) validateClassification(formats strfmt.Registry) error {
-
-	if err := validate.Required("classification", "body", m.Classification); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (m *V1S3PartitionResponse) validateDescription(formats strfmt.Registry) error {
-
-	if err := validate.Required("description", "body", m.Description); err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func (m *V1S3PartitionResponse) validateEndpoint(formats strfmt.Registry) error {
 
 	if err := validate.Required("endpoint", "body", m.Endpoint); err != nil {
diff --git a/cloud-api.json b/cloud-api.json
index 439ea406..357efdcc 100644
--- a/cloud-api.json
+++ b/cloud-api.json
@@ -1557,21 +1557,6 @@
         "networkAccessType"
       ]
     },
-    "v1.ClusterCredentialsRequest": {
-      "properties": {
-        "omitvpn": {
-          "description": "if set to true, returning vpn credentials are omitted, the reason does not need to provided",
-          "type": "boolean"
-        },
-        "reason": {
-          "description": "reason why the vpn key is requested, typically an incident number with short description",
-          "type": "string"
-        }
-      },
-      "required": [
-        "reason"
-      ]
-    },
     "v1.ClusterCredentialsResponse": {
       "properties": {
         "Kubeconfig": {
@@ -5119,12 +5104,6 @@
     },
     "v1.S3PartitionResponse": {
       "properties": {
-        "classification": {
-          "type": "string"
-        },
-        "description": {
-          "type": "string"
-        },
         "endpoint": {
           "type": "string"
         },
@@ -5136,8 +5115,6 @@
         }
       },
       "required": [
-        "classification",
-        "description",
         "endpoint",
         "id",
         "ready"
@@ -8150,14 +8127,6 @@
             "name": "id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "body",
-            "name": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/v1.ClusterCredentialsRequest"
-            }
           }
         ],
         "produces": [