diff --git a/.apigentools-info b/.apigentools-info
index 2c38e4689548..8a5f5f2beaa8 100644
--- a/.apigentools-info
+++ b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-03-06 17:12:16.957125",
-            "spec_repo_commit": "9dd2b6ae"
+            "regenerated": "2025-03-06 18:44:37.388274",
+            "spec_repo_commit": "6cefddd0"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-03-06 17:12:16.974299",
-            "spec_repo_commit": "9dd2b6ae"
+            "regenerated": "2025-03-06 18:44:37.403808",
+            "spec_repo_commit": "6cefddd0"
         }
     }
 }
\ No newline at end of file
diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index 081ba36b6b7e..784fada4c48e 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -1081,12 +1081,14 @@ components:
       x-enum-varnames:
       - API_KEYS
     APITrigger:
+      additionalProperties: false
       description: Trigger a workflow VIA an API. The workflow must be published.
       properties:
         rateLimit:
           $ref: '#/components/schemas/TriggerRateLimit'
       type: object
     APITriggerWrapper:
+      additionalProperties: false
       description: Schema for an API-based trigger.
       properties:
         apiTrigger:
@@ -2103,6 +2105,7 @@ components:
       - base_severity
       type: object
     Annotation:
+      additionalProperties: false
       description: A list of annotations used in the workflow. These are like sticky
         notes for your workflow!
       properties:
@@ -2120,12 +2123,14 @@ components:
       - markdownTextAnnotation
       type: object
     AnnotationDisplay:
+      additionalProperties: false
       description: The definition of `AnnotationDisplay` object.
       properties:
         bounds:
           $ref: '#/components/schemas/AnnotationDisplayBounds'
       type: object
     AnnotationDisplayBounds:
+      additionalProperties: false
       description: The definition of `AnnotationDisplayBounds` object.
       properties:
         height:
@@ -2146,6 +2151,7 @@ components:
           type: number
       type: object
     AnnotationMarkdownTextAnnotation:
+      additionalProperties: false
       description: The definition of `AnnotationMarkdownTextAnnotation` object.
       properties:
         text:
@@ -2296,6 +2302,7 @@ components:
           $ref: '#/components/schemas/DeploymentRelationship'
       type: object
     AppTriggerWrapper:
+      additionalProperties: false
       description: Schema for an App-based trigger.
       properties:
         appTrigger:
@@ -6511,6 +6518,7 @@ components:
       - IN_PROGRESS
       - CLOSED
     CaseTrigger:
+      additionalProperties: false
       description: Trigger a workflow VIA a Case. For automatic triggering a handle
         must be configured and the workflow must be published.
       properties:
@@ -6518,6 +6526,7 @@ components:
           $ref: '#/components/schemas/TriggerRateLimit'
       type: object
     CaseTriggerWrapper:
+      additionalProperties: false
       description: Schema for a Case-based trigger.
       properties:
         caseTrigger:
@@ -6745,6 +6754,7 @@ components:
       x-enum-varnames:
       - SERVICE
     ChangeEventTriggerWrapper:
+      additionalProperties: false
       description: Schema for a Change Event-based trigger.
       properties:
         changeEventTrigger:
@@ -7452,6 +7462,7 @@ components:
       - location
       type: object
     CompletionCondition:
+      additionalProperties: false
       description: The definition of `CompletionCondition` object.
       properties:
         operand1:
@@ -7495,6 +7506,7 @@ components:
       - OPERATOR_IS_EMPTY
       - OPERATOR_IS_NOT_EMPTY
     CompletionGate:
+      additionalProperties: false
       description: Used to create conditions before running subsequent actions.
       properties:
         completionCondition:
@@ -7967,6 +7979,7 @@ components:
           type: array
       type: object
     Connection:
+      additionalProperties: false
       description: The definition of `Connection` object.
       properties:
         connectionId:
@@ -7982,6 +7995,7 @@ components:
       - label
       type: object
     ConnectionEnv:
+      additionalProperties: false
       description: A list of connections or connection groups used in the workflow.
       properties:
         connectionGroups:
@@ -8008,6 +8022,7 @@ components:
       x-enum-varnames:
       - DEFAULT
     ConnectionGroup:
+      additionalProperties: false
       description: The definition of `ConnectionGroup` object.
       properties:
         connectionGroupId:
@@ -10572,6 +10587,7 @@ components:
           type: array
       type: object
     DashboardTriggerWrapper:
+      additionalProperties: false
       description: Schema for a Dashboard-based trigger.
       properties:
         dashboardTrigger:
@@ -12727,6 +12743,7 @@ components:
           type: string
       type: object
     ErrorHandler:
+      additionalProperties: false
       description: Used to handle errors in an action.
       properties:
         fallbackStepName:
@@ -14349,6 +14366,7 @@ components:
       example: https://github.com/organization/example-repository
       type: string
     GithubWebhookTrigger:
+      additionalProperties: false
       description: Trigger a workflow VIA GitHub webhook. To trigger a workflow from
         GitHub, you must set a `webhookSecret`. In your GitHub Webhook Settings, set
         the Payload URL to "base_url"/api/v2/workflows/"workflow_id"/webhook?orgId="org_id",
@@ -14359,6 +14377,7 @@ components:
           $ref: '#/components/schemas/TriggerRateLimit'
       type: object
     GithubWebhookTriggerWrapper:
+      additionalProperties: false
       description: Schema for a GitHub webhook-based trigger.
       properties:
         githubWebhookTrigger:
@@ -16660,6 +16679,7 @@ components:
       x-enum-varnames:
       - INCIDENT_TODOS
     IncidentTrigger:
+      additionalProperties: false
       description: Trigger a workflow VIA an Incident. For automatic triggering a
         handle must be configured and the workflow must be published.
       properties:
@@ -16667,6 +16687,7 @@ components:
           $ref: '#/components/schemas/TriggerRateLimit'
       type: object
     IncidentTriggerWrapper:
+      additionalProperties: false
       description: Schema for an Incident-based trigger.
       properties:
         incidentTrigger:
@@ -17121,6 +17142,7 @@ components:
       - INCIDENT
       - RELATION
     InputSchema:
+      additionalProperties: false
       description: A list of input parameters for the workflow. These can be used
         as dynamic runtime values in your workflow.
       properties:
@@ -17131,6 +17153,7 @@ components:
           type: array
       type: object
     InputSchemaParameters:
+      additionalProperties: false
       description: The definition of `InputSchemaParameters` object.
       properties:
         defaultValue:
@@ -21114,6 +21137,7 @@ components:
           $ref: '#/components/schemas/MonitorDowntimeMatchResourceType'
       type: object
     MonitorTrigger:
+      additionalProperties: false
       description: Trigger a workflow VIA a Monitor. For automatic triggering a handle
         must be configured and the workflow must be published.
       properties:
@@ -21121,6 +21145,7 @@ components:
           $ref: '#/components/schemas/TriggerRateLimit'
       type: object
     MonitorTriggerWrapper:
+      additionalProperties: false
       description: Schema for a Monitor-based trigger.
       properties:
         monitorTrigger:
@@ -21895,6 +21920,7 @@ components:
       x-enum-varnames:
       - ORGS
     OutboundEdge:
+      additionalProperties: false
       description: The definition of `OutboundEdge` object.
       properties:
         branchName:
@@ -22089,6 +22115,7 @@ components:
           type: string
       type: object
     OutputSchema:
+      additionalProperties: false
       description: A list of output parameters for the workflow.
       properties:
         parameters:
@@ -22098,6 +22125,7 @@ components:
           type: array
       type: object
     OutputSchemaParameters:
+      additionalProperties: false
       description: The definition of `OutputSchemaParameters` object.
       properties:
         defaultValue:
@@ -22155,6 +22183,7 @@ components:
           type: integer
       type: object
     Parameter:
+      additionalProperties: false
       description: The definition of `Parameter` object.
       properties:
         name:
@@ -23746,6 +23775,7 @@ components:
           type: string
       type: object
     ReadinessGate:
+      additionalProperties: false
       description: Used to merge multiple branches into a single branch.
       properties:
         thresholdType:
@@ -24685,6 +24715,7 @@ components:
       - data
       type: object
     RetryStrategy:
+      additionalProperties: false
       description: The definition of `RetryStrategy` object.
       properties:
         kind:
@@ -24703,6 +24734,7 @@ components:
       x-enum-varnames:
       - RETRY_STRATEGY_LINEAR
     RetryStrategyLinear:
+      additionalProperties: false
       description: The definition of `RetryStrategyLinear` object.
       properties:
         interval:
@@ -25877,6 +25909,7 @@ components:
           $ref: '#/components/schemas/ScalarFormulaResponseType'
       type: object
     ScheduleTrigger:
+      additionalProperties: false
       description: Trigger a workflow VIA a Schedule. The workflow must be published.
       properties:
         rruleExpression:
@@ -25887,6 +25920,7 @@ components:
       - rruleExpression
       type: object
     ScheduleTriggerWrapper:
+      additionalProperties: false
       description: Schema for a Schedule-based trigger.
       properties:
         scheduleTrigger:
@@ -28161,6 +28195,7 @@ components:
           type: string
       type: object
     SecurityTrigger:
+      additionalProperties: false
       description: Trigger a workflow VIA a Security Signal or Finding. For automatic
         triggering a handle must be configured and the workflow must be published.
       properties:
@@ -28168,6 +28203,7 @@ components:
           $ref: '#/components/schemas/TriggerRateLimit'
       type: object
     SecurityTriggerWrapper:
+      additionalProperties: false
       description: Schema for a Security-based trigger.
       properties:
         securityTrigger:
@@ -29933,6 +29969,7 @@ components:
       - redirect_url
       type: object
     SlackTriggerWrapper:
+      additionalProperties: false
       description: Schema for a Slack-based trigger.
       properties:
         slackTrigger:
@@ -30866,6 +30903,7 @@ components:
           type: string
       type: object
     Spec:
+      additionalProperties: false
       description: The spec defines what the workflow does.
       properties:
         annotations:
@@ -30979,6 +31017,7 @@ components:
       x-enum-varnames:
       - STATEVARIABLE
     Step:
+      additionalProperties: false
       description: A Step is a sub-component of a workflow. Each Step performs an
         action.
       properties:
@@ -31019,12 +31058,14 @@ components:
       - actionId
       type: object
     StepDisplay:
+      additionalProperties: false
       description: The definition of `StepDisplay` object.
       properties:
         bounds:
           $ref: '#/components/schemas/StepDisplayBounds'
       type: object
     StepDisplayBounds:
+      additionalProperties: false
       description: The definition of `StepDisplayBounds` object.
       properties:
         x:
@@ -31858,6 +31899,7 @@ components:
       - $ref: '#/components/schemas/SlackTriggerWrapper'
       - $ref: '#/components/schemas/WorkflowTriggerWrapper'
     TriggerRateLimit:
+      additionalProperties: false
       description: Defines a rate limit for a trigger.
       properties:
         count:
@@ -33302,6 +33344,7 @@ components:
       - attributes
       type: object
     WorkflowDataAttributes:
+      additionalProperties: false
       description: The definition of `WorkflowDataAttributes` object.
       properties:
         createdAt:
@@ -33376,6 +33419,7 @@ components:
       - attributes
       type: object
     WorkflowDataUpdateAttributes:
+      additionalProperties: false
       description: The definition of `WorkflowDataUpdateAttributes` object.
       properties:
         createdAt:
@@ -33479,6 +33523,7 @@ components:
           type: integer
       type: object
     WorkflowTriggerWrapper:
+      additionalProperties: false
       description: Schema for a Workflow-based trigger.
       properties:
         startStepNames:
diff --git a/lib/datadog_api_client/v2/models/annotation.rb b/lib/datadog_api_client/v2/models/annotation.rb
index 9ba7dff309bd..3849734f5425 100644
--- a/lib/datadog_api_client/v2/models/annotation.rb
+++ b/lib/datadog_api_client/v2/models/annotation.rb
@@ -30,8 +30,6 @@ class Annotation
     # The definition of `AnnotationMarkdownTextAnnotation` object.
     attr_reader :markdown_text_annotation
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -60,14 +58,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::Annotation` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::Annotation`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'display')
@@ -123,26 +119,6 @@ def markdown_text_annotation=(markdown_text_annotation)
       @markdown_text_annotation = markdown_text_annotation
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -151,15 +127,14 @@ def ==(o)
       self.class == o.class &&
           display == o.display &&
           id == o.id &&
-          markdown_text_annotation == o.markdown_text_annotation &&
-          additional_properties == o.additional_properties
+          markdown_text_annotation == o.markdown_text_annotation
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [display, id, markdown_text_annotation, additional_properties].hash
+      [display, id, markdown_text_annotation].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/annotation_display.rb b/lib/datadog_api_client/v2/models/annotation_display.rb
index 7d99e59a786f..b8a4358fe129 100644
--- a/lib/datadog_api_client/v2/models/annotation_display.rb
+++ b/lib/datadog_api_client/v2/models/annotation_display.rb
@@ -24,8 +24,6 @@ class AnnotationDisplay
     # The definition of `AnnotationDisplayBounds` object.
     attr_accessor :bounds
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -50,14 +48,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::AnnotationDisplay` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::AnnotationDisplay`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'bounds')
@@ -65,41 +61,20 @@ def initialize(attributes = {})
       end
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          bounds == o.bounds &&
-          additional_properties == o.additional_properties
+          bounds == o.bounds
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [bounds, additional_properties].hash
+      [bounds].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/annotation_display_bounds.rb b/lib/datadog_api_client/v2/models/annotation_display_bounds.rb
index 7e0d728066b0..201adffa29c1 100644
--- a/lib/datadog_api_client/v2/models/annotation_display_bounds.rb
+++ b/lib/datadog_api_client/v2/models/annotation_display_bounds.rb
@@ -33,8 +33,6 @@ class AnnotationDisplayBounds
     # The `bounds` `y`.
     attr_accessor :y
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -65,14 +63,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::AnnotationDisplayBounds` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::AnnotationDisplayBounds`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'height')
@@ -92,26 +88,6 @@ def initialize(attributes = {})
       end
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -121,15 +97,14 @@ def ==(o)
           height == o.height &&
           width == o.width &&
           x == o.x &&
-          y == o.y &&
-          additional_properties == o.additional_properties
+          y == o.y
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [height, width, x, y, additional_properties].hash
+      [height, width, x, y].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/annotation_markdown_text_annotation.rb b/lib/datadog_api_client/v2/models/annotation_markdown_text_annotation.rb
index f07b19bd4eba..cc04e6898384 100644
--- a/lib/datadog_api_client/v2/models/annotation_markdown_text_annotation.rb
+++ b/lib/datadog_api_client/v2/models/annotation_markdown_text_annotation.rb
@@ -24,8 +24,6 @@ class AnnotationMarkdownTextAnnotation
     # The `markdownTextAnnotation` `text`.
     attr_accessor :text
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -50,14 +48,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::AnnotationMarkdownTextAnnotation` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::AnnotationMarkdownTextAnnotation`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'text')
@@ -65,41 +61,20 @@ def initialize(attributes = {})
       end
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          text == o.text &&
-          additional_properties == o.additional_properties
+          text == o.text
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [text, additional_properties].hash
+      [text].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/api_trigger.rb b/lib/datadog_api_client/v2/models/api_trigger.rb
index d07597181403..dc408f340855 100644
--- a/lib/datadog_api_client/v2/models/api_trigger.rb
+++ b/lib/datadog_api_client/v2/models/api_trigger.rb
@@ -24,8 +24,6 @@ class APITrigger
     # Defines a rate limit for a trigger.
     attr_accessor :rate_limit
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -50,14 +48,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::APITrigger` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::APITrigger`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'rate_limit')
@@ -65,41 +61,20 @@ def initialize(attributes = {})
       end
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          rate_limit == o.rate_limit &&
-          additional_properties == o.additional_properties
+          rate_limit == o.rate_limit
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [rate_limit, additional_properties].hash
+      [rate_limit].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/api_trigger_wrapper.rb b/lib/datadog_api_client/v2/models/api_trigger_wrapper.rb
index 5dd07a64fd0a..642f26725cc4 100644
--- a/lib/datadog_api_client/v2/models/api_trigger_wrapper.rb
+++ b/lib/datadog_api_client/v2/models/api_trigger_wrapper.rb
@@ -27,8 +27,6 @@ class APITriggerWrapper
     # A list of steps that run first after a trigger fires.
     attr_accessor :start_step_names
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -55,14 +53,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::APITriggerWrapper` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::APITriggerWrapper`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'api_trigger')
@@ -94,26 +90,6 @@ def api_trigger=(api_trigger)
       @api_trigger = api_trigger
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -121,15 +97,14 @@ def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           api_trigger == o.api_trigger &&
-          start_step_names == o.start_step_names &&
-          additional_properties == o.additional_properties
+          start_step_names == o.start_step_names
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [api_trigger, start_step_names, additional_properties].hash
+      [api_trigger, start_step_names].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/app_trigger_wrapper.rb b/lib/datadog_api_client/v2/models/app_trigger_wrapper.rb
index 344c4512c230..d69b408addf7 100644
--- a/lib/datadog_api_client/v2/models/app_trigger_wrapper.rb
+++ b/lib/datadog_api_client/v2/models/app_trigger_wrapper.rb
@@ -27,8 +27,6 @@ class AppTriggerWrapper
     # A list of steps that run first after a trigger fires.
     attr_accessor :start_step_names
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -55,14 +53,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::AppTriggerWrapper` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::AppTriggerWrapper`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'app_trigger')
@@ -94,26 +90,6 @@ def app_trigger=(app_trigger)
       @app_trigger = app_trigger
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -121,15 +97,14 @@ def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           app_trigger == o.app_trigger &&
-          start_step_names == o.start_step_names &&
-          additional_properties == o.additional_properties
+          start_step_names == o.start_step_names
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [app_trigger, start_step_names, additional_properties].hash
+      [app_trigger, start_step_names].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/case_trigger.rb b/lib/datadog_api_client/v2/models/case_trigger.rb
index e1aa9de8e65b..d01dd079cee2 100644
--- a/lib/datadog_api_client/v2/models/case_trigger.rb
+++ b/lib/datadog_api_client/v2/models/case_trigger.rb
@@ -24,8 +24,6 @@ class CaseTrigger
     # Defines a rate limit for a trigger.
     attr_accessor :rate_limit
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -50,14 +48,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::CaseTrigger` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::CaseTrigger`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'rate_limit')
@@ -65,41 +61,20 @@ def initialize(attributes = {})
       end
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          rate_limit == o.rate_limit &&
-          additional_properties == o.additional_properties
+          rate_limit == o.rate_limit
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [rate_limit, additional_properties].hash
+      [rate_limit].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/case_trigger_wrapper.rb b/lib/datadog_api_client/v2/models/case_trigger_wrapper.rb
index 14b0a77c6f16..e01295cc2e51 100644
--- a/lib/datadog_api_client/v2/models/case_trigger_wrapper.rb
+++ b/lib/datadog_api_client/v2/models/case_trigger_wrapper.rb
@@ -27,8 +27,6 @@ class CaseTriggerWrapper
     # A list of steps that run first after a trigger fires.
     attr_accessor :start_step_names
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -55,14 +53,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::CaseTriggerWrapper` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::CaseTriggerWrapper`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'case_trigger')
@@ -94,26 +90,6 @@ def case_trigger=(case_trigger)
       @case_trigger = case_trigger
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -121,15 +97,14 @@ def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           case_trigger == o.case_trigger &&
-          start_step_names == o.start_step_names &&
-          additional_properties == o.additional_properties
+          start_step_names == o.start_step_names
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [case_trigger, start_step_names, additional_properties].hash
+      [case_trigger, start_step_names].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/change_event_trigger_wrapper.rb b/lib/datadog_api_client/v2/models/change_event_trigger_wrapper.rb
index 300b94e133f4..9f9b5bd747de 100644
--- a/lib/datadog_api_client/v2/models/change_event_trigger_wrapper.rb
+++ b/lib/datadog_api_client/v2/models/change_event_trigger_wrapper.rb
@@ -27,8 +27,6 @@ class ChangeEventTriggerWrapper
     # A list of steps that run first after a trigger fires.
     attr_accessor :start_step_names
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -55,14 +53,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::ChangeEventTriggerWrapper` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::ChangeEventTriggerWrapper`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'change_event_trigger')
@@ -94,26 +90,6 @@ def change_event_trigger=(change_event_trigger)
       @change_event_trigger = change_event_trigger
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -121,15 +97,14 @@ def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           change_event_trigger == o.change_event_trigger &&
-          start_step_names == o.start_step_names &&
-          additional_properties == o.additional_properties
+          start_step_names == o.start_step_names
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [change_event_trigger, start_step_names, additional_properties].hash
+      [change_event_trigger, start_step_names].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/completion_condition.rb b/lib/datadog_api_client/v2/models/completion_condition.rb
index e323261f925e..a123784aa588 100644
--- a/lib/datadog_api_client/v2/models/completion_condition.rb
+++ b/lib/datadog_api_client/v2/models/completion_condition.rb
@@ -30,8 +30,6 @@ class CompletionCondition
     # The definition of `CompletionConditionOperator` object.
     attr_reader :operator
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -60,14 +58,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::CompletionCondition` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::CompletionCondition`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'operand1')
@@ -112,26 +108,6 @@ def operator=(operator)
       @operator = operator
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -140,15 +116,14 @@ def ==(o)
       self.class == o.class &&
           operand1 == o.operand1 &&
           operand2 == o.operand2 &&
-          operator == o.operator &&
-          additional_properties == o.additional_properties
+          operator == o.operator
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [operand1, operand2, operator, additional_properties].hash
+      [operand1, operand2, operator].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/completion_gate.rb b/lib/datadog_api_client/v2/models/completion_gate.rb
index 770116de4a54..736f43701f80 100644
--- a/lib/datadog_api_client/v2/models/completion_gate.rb
+++ b/lib/datadog_api_client/v2/models/completion_gate.rb
@@ -27,8 +27,6 @@ class CompletionGate
     # The definition of `RetryStrategy` object.
     attr_reader :retry_strategy
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -55,14 +53,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::CompletionGate` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::CompletionGate`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'completion_condition')
@@ -103,26 +99,6 @@ def retry_strategy=(retry_strategy)
       @retry_strategy = retry_strategy
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -130,15 +106,14 @@ def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           completion_condition == o.completion_condition &&
-          retry_strategy == o.retry_strategy &&
-          additional_properties == o.additional_properties
+          retry_strategy == o.retry_strategy
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [completion_condition, retry_strategy, additional_properties].hash
+      [completion_condition, retry_strategy].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/connection.rb b/lib/datadog_api_client/v2/models/connection.rb
index c8db196a8b84..f0b39d05a4ca 100644
--- a/lib/datadog_api_client/v2/models/connection.rb
+++ b/lib/datadog_api_client/v2/models/connection.rb
@@ -27,8 +27,6 @@ class Connection
     # The `Connection` `label`.
     attr_reader :label
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -55,14 +53,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::Connection` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::Connection`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'connection_id')
@@ -103,26 +99,6 @@ def label=(label)
       @label = label
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -130,15 +106,14 @@ def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           connection_id == o.connection_id &&
-          label == o.label &&
-          additional_properties == o.additional_properties
+          label == o.label
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [connection_id, label, additional_properties].hash
+      [connection_id, label].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/connection_env.rb b/lib/datadog_api_client/v2/models/connection_env.rb
index ffcc341d2295..47c9e0517e13 100644
--- a/lib/datadog_api_client/v2/models/connection_env.rb
+++ b/lib/datadog_api_client/v2/models/connection_env.rb
@@ -30,8 +30,6 @@ class ConnectionEnv
     # The definition of `ConnectionEnvEnv` object.
     attr_reader :env
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -60,14 +58,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::ConnectionEnv` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::ConnectionEnv`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'connection_groups')
@@ -105,26 +101,6 @@ def env=(env)
       @env = env
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -133,15 +109,14 @@ def ==(o)
       self.class == o.class &&
           connection_groups == o.connection_groups &&
           connections == o.connections &&
-          env == o.env &&
-          additional_properties == o.additional_properties
+          env == o.env
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [connection_groups, connections, env, additional_properties].hash
+      [connection_groups, connections, env].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/connection_group.rb b/lib/datadog_api_client/v2/models/connection_group.rb
index 1a5a459e313c..20e3f7336d51 100644
--- a/lib/datadog_api_client/v2/models/connection_group.rb
+++ b/lib/datadog_api_client/v2/models/connection_group.rb
@@ -30,8 +30,6 @@ class ConnectionGroup
     # The `ConnectionGroup` `tags`.
     attr_reader :tags
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -60,14 +58,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::ConnectionGroup` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::ConnectionGroup`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'connection_group_id')
@@ -125,26 +121,6 @@ def tags=(tags)
       @tags = tags
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -153,15 +129,14 @@ def ==(o)
       self.class == o.class &&
           connection_group_id == o.connection_group_id &&
           label == o.label &&
-          tags == o.tags &&
-          additional_properties == o.additional_properties
+          tags == o.tags
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [connection_group_id, label, tags, additional_properties].hash
+      [connection_group_id, label, tags].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/dashboard_trigger_wrapper.rb b/lib/datadog_api_client/v2/models/dashboard_trigger_wrapper.rb
index 9afda106a73d..d72e4f25cfc0 100644
--- a/lib/datadog_api_client/v2/models/dashboard_trigger_wrapper.rb
+++ b/lib/datadog_api_client/v2/models/dashboard_trigger_wrapper.rb
@@ -27,8 +27,6 @@ class DashboardTriggerWrapper
     # A list of steps that run first after a trigger fires.
     attr_accessor :start_step_names
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -55,14 +53,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::DashboardTriggerWrapper` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::DashboardTriggerWrapper`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'dashboard_trigger')
@@ -94,26 +90,6 @@ def dashboard_trigger=(dashboard_trigger)
       @dashboard_trigger = dashboard_trigger
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -121,15 +97,14 @@ def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           dashboard_trigger == o.dashboard_trigger &&
-          start_step_names == o.start_step_names &&
-          additional_properties == o.additional_properties
+          start_step_names == o.start_step_names
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [dashboard_trigger, start_step_names, additional_properties].hash
+      [dashboard_trigger, start_step_names].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/error_handler.rb b/lib/datadog_api_client/v2/models/error_handler.rb
index 4ecbcaaeba98..241275441926 100644
--- a/lib/datadog_api_client/v2/models/error_handler.rb
+++ b/lib/datadog_api_client/v2/models/error_handler.rb
@@ -27,8 +27,6 @@ class ErrorHandler
     # The definition of `RetryStrategy` object.
     attr_reader :retry_strategy
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -55,14 +53,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::ErrorHandler` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::ErrorHandler`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'fallback_step_name')
@@ -103,26 +99,6 @@ def retry_strategy=(retry_strategy)
       @retry_strategy = retry_strategy
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -130,15 +106,14 @@ def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           fallback_step_name == o.fallback_step_name &&
-          retry_strategy == o.retry_strategy &&
-          additional_properties == o.additional_properties
+          retry_strategy == o.retry_strategy
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [fallback_step_name, retry_strategy, additional_properties].hash
+      [fallback_step_name, retry_strategy].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/github_webhook_trigger.rb b/lib/datadog_api_client/v2/models/github_webhook_trigger.rb
index 2f0348f3e641..96863ee1264d 100644
--- a/lib/datadog_api_client/v2/models/github_webhook_trigger.rb
+++ b/lib/datadog_api_client/v2/models/github_webhook_trigger.rb
@@ -24,8 +24,6 @@ class GithubWebhookTrigger
     # Defines a rate limit for a trigger.
     attr_accessor :rate_limit
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -50,14 +48,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::GithubWebhookTrigger` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::GithubWebhookTrigger`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'rate_limit')
@@ -65,41 +61,20 @@ def initialize(attributes = {})
       end
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          rate_limit == o.rate_limit &&
-          additional_properties == o.additional_properties
+          rate_limit == o.rate_limit
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [rate_limit, additional_properties].hash
+      [rate_limit].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/github_webhook_trigger_wrapper.rb b/lib/datadog_api_client/v2/models/github_webhook_trigger_wrapper.rb
index 88b42aa95d59..758763060adc 100644
--- a/lib/datadog_api_client/v2/models/github_webhook_trigger_wrapper.rb
+++ b/lib/datadog_api_client/v2/models/github_webhook_trigger_wrapper.rb
@@ -27,8 +27,6 @@ class GithubWebhookTriggerWrapper
     # A list of steps that run first after a trigger fires.
     attr_accessor :start_step_names
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -55,14 +53,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::GithubWebhookTriggerWrapper` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::GithubWebhookTriggerWrapper`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'github_webhook_trigger')
@@ -94,26 +90,6 @@ def github_webhook_trigger=(github_webhook_trigger)
       @github_webhook_trigger = github_webhook_trigger
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -121,15 +97,14 @@ def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           github_webhook_trigger == o.github_webhook_trigger &&
-          start_step_names == o.start_step_names &&
-          additional_properties == o.additional_properties
+          start_step_names == o.start_step_names
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [github_webhook_trigger, start_step_names, additional_properties].hash
+      [github_webhook_trigger, start_step_names].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/incident_trigger.rb b/lib/datadog_api_client/v2/models/incident_trigger.rb
index 11429c14d48b..4ce7efb19588 100644
--- a/lib/datadog_api_client/v2/models/incident_trigger.rb
+++ b/lib/datadog_api_client/v2/models/incident_trigger.rb
@@ -24,8 +24,6 @@ class IncidentTrigger
     # Defines a rate limit for a trigger.
     attr_accessor :rate_limit
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -50,14 +48,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::IncidentTrigger` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::IncidentTrigger`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'rate_limit')
@@ -65,41 +61,20 @@ def initialize(attributes = {})
       end
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          rate_limit == o.rate_limit &&
-          additional_properties == o.additional_properties
+          rate_limit == o.rate_limit
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [rate_limit, additional_properties].hash
+      [rate_limit].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/incident_trigger_wrapper.rb b/lib/datadog_api_client/v2/models/incident_trigger_wrapper.rb
index f8667820d98c..3a3a45c61514 100644
--- a/lib/datadog_api_client/v2/models/incident_trigger_wrapper.rb
+++ b/lib/datadog_api_client/v2/models/incident_trigger_wrapper.rb
@@ -27,8 +27,6 @@ class IncidentTriggerWrapper
     # A list of steps that run first after a trigger fires.
     attr_accessor :start_step_names
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -55,14 +53,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::IncidentTriggerWrapper` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::IncidentTriggerWrapper`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'incident_trigger')
@@ -94,26 +90,6 @@ def incident_trigger=(incident_trigger)
       @incident_trigger = incident_trigger
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -121,15 +97,14 @@ def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           incident_trigger == o.incident_trigger &&
-          start_step_names == o.start_step_names &&
-          additional_properties == o.additional_properties
+          start_step_names == o.start_step_names
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [incident_trigger, start_step_names, additional_properties].hash
+      [incident_trigger, start_step_names].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/input_schema.rb b/lib/datadog_api_client/v2/models/input_schema.rb
index 8880628a2c10..9f2208116277 100644
--- a/lib/datadog_api_client/v2/models/input_schema.rb
+++ b/lib/datadog_api_client/v2/models/input_schema.rb
@@ -24,8 +24,6 @@ class InputSchema
     # The `InputSchema` `parameters`.
     attr_accessor :parameters
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -50,14 +48,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::InputSchema` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::InputSchema`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'parameters')
@@ -67,41 +63,20 @@ def initialize(attributes = {})
       end
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          parameters == o.parameters &&
-          additional_properties == o.additional_properties
+          parameters == o.parameters
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [parameters, additional_properties].hash
+      [parameters].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/input_schema_parameters.rb b/lib/datadog_api_client/v2/models/input_schema_parameters.rb
index 933955d00d77..3b4b8396e6ef 100644
--- a/lib/datadog_api_client/v2/models/input_schema_parameters.rb
+++ b/lib/datadog_api_client/v2/models/input_schema_parameters.rb
@@ -36,8 +36,6 @@ class InputSchemaParameters
     # The definition of `InputSchemaParametersType` object.
     attr_reader :type
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -70,14 +68,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::InputSchemaParameters` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::InputSchemaParameters`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'default_value')
@@ -130,26 +126,6 @@ def type=(type)
       @type = type
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -160,15 +136,14 @@ def ==(o)
           description == o.description &&
           label == o.label &&
           name == o.name &&
-          type == o.type &&
-          additional_properties == o.additional_properties
+          type == o.type
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [default_value, description, label, name, type, additional_properties].hash
+      [default_value, description, label, name, type].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/monitor_trigger.rb b/lib/datadog_api_client/v2/models/monitor_trigger.rb
index 37980ffa2479..414c3e85fb75 100644
--- a/lib/datadog_api_client/v2/models/monitor_trigger.rb
+++ b/lib/datadog_api_client/v2/models/monitor_trigger.rb
@@ -24,8 +24,6 @@ class MonitorTrigger
     # Defines a rate limit for a trigger.
     attr_accessor :rate_limit
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -50,14 +48,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::MonitorTrigger` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::MonitorTrigger`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'rate_limit')
@@ -65,41 +61,20 @@ def initialize(attributes = {})
       end
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          rate_limit == o.rate_limit &&
-          additional_properties == o.additional_properties
+          rate_limit == o.rate_limit
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [rate_limit, additional_properties].hash
+      [rate_limit].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/monitor_trigger_wrapper.rb b/lib/datadog_api_client/v2/models/monitor_trigger_wrapper.rb
index 7775123600fb..c6ea37cada99 100644
--- a/lib/datadog_api_client/v2/models/monitor_trigger_wrapper.rb
+++ b/lib/datadog_api_client/v2/models/monitor_trigger_wrapper.rb
@@ -27,8 +27,6 @@ class MonitorTriggerWrapper
     # A list of steps that run first after a trigger fires.
     attr_accessor :start_step_names
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -55,14 +53,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::MonitorTriggerWrapper` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::MonitorTriggerWrapper`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'monitor_trigger')
@@ -94,26 +90,6 @@ def monitor_trigger=(monitor_trigger)
       @monitor_trigger = monitor_trigger
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -121,15 +97,14 @@ def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           monitor_trigger == o.monitor_trigger &&
-          start_step_names == o.start_step_names &&
-          additional_properties == o.additional_properties
+          start_step_names == o.start_step_names
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [monitor_trigger, start_step_names, additional_properties].hash
+      [monitor_trigger, start_step_names].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/outbound_edge.rb b/lib/datadog_api_client/v2/models/outbound_edge.rb
index 0765af2e3f1b..621b7b97822a 100644
--- a/lib/datadog_api_client/v2/models/outbound_edge.rb
+++ b/lib/datadog_api_client/v2/models/outbound_edge.rb
@@ -27,8 +27,6 @@ class OutboundEdge
     # The `OutboundEdge` `nextStepName`.
     attr_reader :next_step_name
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -55,14 +53,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::OutboundEdge` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::OutboundEdge`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'branch_name')
@@ -103,26 +99,6 @@ def next_step_name=(next_step_name)
       @next_step_name = next_step_name
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -130,15 +106,14 @@ def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           branch_name == o.branch_name &&
-          next_step_name == o.next_step_name &&
-          additional_properties == o.additional_properties
+          next_step_name == o.next_step_name
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [branch_name, next_step_name, additional_properties].hash
+      [branch_name, next_step_name].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/output_schema.rb b/lib/datadog_api_client/v2/models/output_schema.rb
index 4084294e3280..dcbe0275a72e 100644
--- a/lib/datadog_api_client/v2/models/output_schema.rb
+++ b/lib/datadog_api_client/v2/models/output_schema.rb
@@ -24,8 +24,6 @@ class OutputSchema
     # The `OutputSchema` `parameters`.
     attr_accessor :parameters
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -50,14 +48,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::OutputSchema` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::OutputSchema`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'parameters')
@@ -67,41 +63,20 @@ def initialize(attributes = {})
       end
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          parameters == o.parameters &&
-          additional_properties == o.additional_properties
+          parameters == o.parameters
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [parameters, additional_properties].hash
+      [parameters].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/output_schema_parameters.rb b/lib/datadog_api_client/v2/models/output_schema_parameters.rb
index f43f779ffa46..9d82bb47c36e 100644
--- a/lib/datadog_api_client/v2/models/output_schema_parameters.rb
+++ b/lib/datadog_api_client/v2/models/output_schema_parameters.rb
@@ -39,8 +39,6 @@ class OutputSchemaParameters
     # The `OutputSchemaParameters` `value`.
     attr_accessor :value
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -75,14 +73,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::OutputSchemaParameters` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::OutputSchemaParameters`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'default_value')
@@ -139,26 +135,6 @@ def type=(type)
       @type = type
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -170,15 +146,14 @@ def ==(o)
           label == o.label &&
           name == o.name &&
           type == o.type &&
-          value == o.value &&
-          additional_properties == o.additional_properties
+          value == o.value
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [default_value, description, label, name, type, value, additional_properties].hash
+      [default_value, description, label, name, type, value].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/parameter.rb b/lib/datadog_api_client/v2/models/parameter.rb
index 7843e6e19aaf..83184986e3b1 100644
--- a/lib/datadog_api_client/v2/models/parameter.rb
+++ b/lib/datadog_api_client/v2/models/parameter.rb
@@ -27,8 +27,6 @@ class Parameter
     # The `Parameter` `value`.
     attr_reader :value
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -55,14 +53,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::Parameter` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::Parameter`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'name')
@@ -103,26 +99,6 @@ def value=(value)
       @value = value
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -130,15 +106,14 @@ def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           name == o.name &&
-          value == o.value &&
-          additional_properties == o.additional_properties
+          value == o.value
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [name, value, additional_properties].hash
+      [name, value].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/readiness_gate.rb b/lib/datadog_api_client/v2/models/readiness_gate.rb
index f6806cff4dae..c9e4dd982318 100644
--- a/lib/datadog_api_client/v2/models/readiness_gate.rb
+++ b/lib/datadog_api_client/v2/models/readiness_gate.rb
@@ -24,8 +24,6 @@ class ReadinessGate
     # The definition of `ReadinessGateThresholdType` object.
     attr_reader :threshold_type
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -50,14 +48,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::ReadinessGate` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::ReadinessGate`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'threshold_type')
@@ -83,41 +79,20 @@ def threshold_type=(threshold_type)
       @threshold_type = threshold_type
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          threshold_type == o.threshold_type &&
-          additional_properties == o.additional_properties
+          threshold_type == o.threshold_type
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [threshold_type, additional_properties].hash
+      [threshold_type].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/retry_strategy.rb b/lib/datadog_api_client/v2/models/retry_strategy.rb
index 8eb194b7ac90..e993f487f2b8 100644
--- a/lib/datadog_api_client/v2/models/retry_strategy.rb
+++ b/lib/datadog_api_client/v2/models/retry_strategy.rb
@@ -27,8 +27,6 @@ class RetryStrategy
     # The definition of `RetryStrategyLinear` object.
     attr_accessor :linear
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -55,14 +53,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::RetryStrategy` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::RetryStrategy`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'kind')
@@ -92,26 +88,6 @@ def kind=(kind)
       @kind = kind
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -119,15 +95,14 @@ def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           kind == o.kind &&
-          linear == o.linear &&
-          additional_properties == o.additional_properties
+          linear == o.linear
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [kind, linear, additional_properties].hash
+      [kind, linear].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/retry_strategy_linear.rb b/lib/datadog_api_client/v2/models/retry_strategy_linear.rb
index 373c4a74d579..c39a00924b7d 100644
--- a/lib/datadog_api_client/v2/models/retry_strategy_linear.rb
+++ b/lib/datadog_api_client/v2/models/retry_strategy_linear.rb
@@ -27,8 +27,6 @@ class RetryStrategyLinear
     # The `RetryStrategyLinear` `maxRetries`.
     attr_reader :max_retries
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -55,14 +53,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::RetryStrategyLinear` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::RetryStrategyLinear`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'interval')
@@ -103,26 +99,6 @@ def max_retries=(max_retries)
       @max_retries = max_retries
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -130,15 +106,14 @@ def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           interval == o.interval &&
-          max_retries == o.max_retries &&
-          additional_properties == o.additional_properties
+          max_retries == o.max_retries
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [interval, max_retries, additional_properties].hash
+      [interval, max_retries].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/schedule_trigger.rb b/lib/datadog_api_client/v2/models/schedule_trigger.rb
index 92eca72bca33..cab998677f18 100644
--- a/lib/datadog_api_client/v2/models/schedule_trigger.rb
+++ b/lib/datadog_api_client/v2/models/schedule_trigger.rb
@@ -24,8 +24,6 @@ class ScheduleTrigger
     # Recurrence rule expression for scheduling.
     attr_reader :rrule_expression
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -50,14 +48,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::ScheduleTrigger` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::ScheduleTrigger`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'rrule_expression')
@@ -83,41 +79,20 @@ def rrule_expression=(rrule_expression)
       @rrule_expression = rrule_expression
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          rrule_expression == o.rrule_expression &&
-          additional_properties == o.additional_properties
+          rrule_expression == o.rrule_expression
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [rrule_expression, additional_properties].hash
+      [rrule_expression].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/schedule_trigger_wrapper.rb b/lib/datadog_api_client/v2/models/schedule_trigger_wrapper.rb
index db3d6b7efda3..1e15e185304d 100644
--- a/lib/datadog_api_client/v2/models/schedule_trigger_wrapper.rb
+++ b/lib/datadog_api_client/v2/models/schedule_trigger_wrapper.rb
@@ -27,8 +27,6 @@ class ScheduleTriggerWrapper
     # A list of steps that run first after a trigger fires.
     attr_accessor :start_step_names
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -55,14 +53,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::ScheduleTriggerWrapper` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::ScheduleTriggerWrapper`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'schedule_trigger')
@@ -94,26 +90,6 @@ def schedule_trigger=(schedule_trigger)
       @schedule_trigger = schedule_trigger
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -121,15 +97,14 @@ def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           schedule_trigger == o.schedule_trigger &&
-          start_step_names == o.start_step_names &&
-          additional_properties == o.additional_properties
+          start_step_names == o.start_step_names
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [schedule_trigger, start_step_names, additional_properties].hash
+      [schedule_trigger, start_step_names].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/security_trigger.rb b/lib/datadog_api_client/v2/models/security_trigger.rb
index 4ebd64c799f0..528b9345235e 100644
--- a/lib/datadog_api_client/v2/models/security_trigger.rb
+++ b/lib/datadog_api_client/v2/models/security_trigger.rb
@@ -24,8 +24,6 @@ class SecurityTrigger
     # Defines a rate limit for a trigger.
     attr_accessor :rate_limit
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -50,14 +48,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::SecurityTrigger` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::SecurityTrigger`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'rate_limit')
@@ -65,41 +61,20 @@ def initialize(attributes = {})
       end
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          rate_limit == o.rate_limit &&
-          additional_properties == o.additional_properties
+          rate_limit == o.rate_limit
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [rate_limit, additional_properties].hash
+      [rate_limit].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/security_trigger_wrapper.rb b/lib/datadog_api_client/v2/models/security_trigger_wrapper.rb
index 072599e569fa..7cdf2d11ac5f 100644
--- a/lib/datadog_api_client/v2/models/security_trigger_wrapper.rb
+++ b/lib/datadog_api_client/v2/models/security_trigger_wrapper.rb
@@ -27,8 +27,6 @@ class SecurityTriggerWrapper
     # A list of steps that run first after a trigger fires.
     attr_accessor :start_step_names
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -55,14 +53,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::SecurityTriggerWrapper` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::SecurityTriggerWrapper`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'security_trigger')
@@ -94,26 +90,6 @@ def security_trigger=(security_trigger)
       @security_trigger = security_trigger
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -121,15 +97,14 @@ def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           security_trigger == o.security_trigger &&
-          start_step_names == o.start_step_names &&
-          additional_properties == o.additional_properties
+          start_step_names == o.start_step_names
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [security_trigger, start_step_names, additional_properties].hash
+      [security_trigger, start_step_names].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/slack_trigger_wrapper.rb b/lib/datadog_api_client/v2/models/slack_trigger_wrapper.rb
index 5e5ede477059..f3d45bb53270 100644
--- a/lib/datadog_api_client/v2/models/slack_trigger_wrapper.rb
+++ b/lib/datadog_api_client/v2/models/slack_trigger_wrapper.rb
@@ -27,8 +27,6 @@ class SlackTriggerWrapper
     # A list of steps that run first after a trigger fires.
     attr_accessor :start_step_names
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -55,14 +53,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::SlackTriggerWrapper` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::SlackTriggerWrapper`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'slack_trigger')
@@ -94,26 +90,6 @@ def slack_trigger=(slack_trigger)
       @slack_trigger = slack_trigger
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -121,15 +97,14 @@ def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           slack_trigger == o.slack_trigger &&
-          start_step_names == o.start_step_names &&
-          additional_properties == o.additional_properties
+          start_step_names == o.start_step_names
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [slack_trigger, start_step_names, additional_properties].hash
+      [slack_trigger, start_step_names].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/spec.rb b/lib/datadog_api_client/v2/models/spec.rb
index 8fc0667e46df..2ec7942c4cf3 100644
--- a/lib/datadog_api_client/v2/models/spec.rb
+++ b/lib/datadog_api_client/v2/models/spec.rb
@@ -42,8 +42,6 @@ class Spec
     # The list of triggers that activate this workflow. At least one trigger is required, and each trigger type may appear at most once.
     attr_accessor :triggers
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -80,14 +78,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::Spec` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::Spec`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'annotations')
@@ -127,26 +123,6 @@ def initialize(attributes = {})
       end
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -159,15 +135,14 @@ def ==(o)
           input_schema == o.input_schema &&
           output_schema == o.output_schema &&
           steps == o.steps &&
-          triggers == o.triggers &&
-          additional_properties == o.additional_properties
+          triggers == o.triggers
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [annotations, connection_envs, handle, input_schema, output_schema, steps, triggers, additional_properties].hash
+      [annotations, connection_envs, handle, input_schema, output_schema, steps, triggers].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/step.rb b/lib/datadog_api_client/v2/models/step.rb
index 9d7a70bf1241..95a4d375f51e 100644
--- a/lib/datadog_api_client/v2/models/step.rb
+++ b/lib/datadog_api_client/v2/models/step.rb
@@ -48,8 +48,6 @@ class Step
     # Used to merge multiple branches into a single branch.
     attr_accessor :readiness_gate
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -90,14 +88,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::Step` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::Step`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'action_id')
@@ -172,26 +168,6 @@ def name=(name)
       @name = name
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -206,15 +182,14 @@ def ==(o)
           name == o.name &&
           outbound_edges == o.outbound_edges &&
           parameters == o.parameters &&
-          readiness_gate == o.readiness_gate &&
-          additional_properties == o.additional_properties
+          readiness_gate == o.readiness_gate
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [action_id, completion_gate, connection_label, display, error_handlers, name, outbound_edges, parameters, readiness_gate, additional_properties].hash
+      [action_id, completion_gate, connection_label, display, error_handlers, name, outbound_edges, parameters, readiness_gate].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/step_display.rb b/lib/datadog_api_client/v2/models/step_display.rb
index 40fbcb6bae69..8adf1a0e509e 100644
--- a/lib/datadog_api_client/v2/models/step_display.rb
+++ b/lib/datadog_api_client/v2/models/step_display.rb
@@ -24,8 +24,6 @@ class StepDisplay
     # The definition of `StepDisplayBounds` object.
     attr_accessor :bounds
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -50,14 +48,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::StepDisplay` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::StepDisplay`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'bounds')
@@ -65,41 +61,20 @@ def initialize(attributes = {})
       end
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          bounds == o.bounds &&
-          additional_properties == o.additional_properties
+          bounds == o.bounds
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [bounds, additional_properties].hash
+      [bounds].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/step_display_bounds.rb b/lib/datadog_api_client/v2/models/step_display_bounds.rb
index 95b69c9c093e..79661f997fb5 100644
--- a/lib/datadog_api_client/v2/models/step_display_bounds.rb
+++ b/lib/datadog_api_client/v2/models/step_display_bounds.rb
@@ -27,8 +27,6 @@ class StepDisplayBounds
     # The `bounds` `y`.
     attr_accessor :y
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -55,14 +53,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::StepDisplayBounds` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::StepDisplayBounds`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'x')
@@ -74,26 +70,6 @@ def initialize(attributes = {})
       end
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -101,15 +77,14 @@ def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           x == o.x &&
-          y == o.y &&
-          additional_properties == o.additional_properties
+          y == o.y
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [x, y, additional_properties].hash
+      [x, y].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/trigger_rate_limit.rb b/lib/datadog_api_client/v2/models/trigger_rate_limit.rb
index 2fa7fa6cfc86..ee2fad805fd2 100644
--- a/lib/datadog_api_client/v2/models/trigger_rate_limit.rb
+++ b/lib/datadog_api_client/v2/models/trigger_rate_limit.rb
@@ -27,8 +27,6 @@ class TriggerRateLimit
     # The `TriggerRateLimit` `interval`. The expected format is the number of seconds ending with an s. For example, 1 day is 86400s
     attr_accessor :interval
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -55,14 +53,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::TriggerRateLimit` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::TriggerRateLimit`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'count')
@@ -74,26 +70,6 @@ def initialize(attributes = {})
       end
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -101,15 +77,14 @@ def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           count == o.count &&
-          interval == o.interval &&
-          additional_properties == o.additional_properties
+          interval == o.interval
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [count, interval, additional_properties].hash
+      [count, interval].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/workflow_data_attributes.rb b/lib/datadog_api_client/v2/models/workflow_data_attributes.rb
index 0040f7a264f8..e95690318bb8 100644
--- a/lib/datadog_api_client/v2/models/workflow_data_attributes.rb
+++ b/lib/datadog_api_client/v2/models/workflow_data_attributes.rb
@@ -45,8 +45,6 @@ class WorkflowDataAttributes
     # If a Webhook trigger is defined on this workflow, a webhookSecret is required and should be provided here.
     attr_accessor :webhook_secret
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -85,14 +83,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::WorkflowDataAttributes` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::WorkflowDataAttributes`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'created_at')
@@ -159,26 +155,6 @@ def spec=(spec)
       @spec = spec
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -192,15 +168,14 @@ def ==(o)
           spec == o.spec &&
           tags == o.tags &&
           updated_at == o.updated_at &&
-          webhook_secret == o.webhook_secret &&
-          additional_properties == o.additional_properties
+          webhook_secret == o.webhook_secret
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [created_at, description, name, published, spec, tags, updated_at, webhook_secret, additional_properties].hash
+      [created_at, description, name, published, spec, tags, updated_at, webhook_secret].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/workflow_data_update_attributes.rb b/lib/datadog_api_client/v2/models/workflow_data_update_attributes.rb
index eb59d48251b5..d1825d2a5d4a 100644
--- a/lib/datadog_api_client/v2/models/workflow_data_update_attributes.rb
+++ b/lib/datadog_api_client/v2/models/workflow_data_update_attributes.rb
@@ -45,8 +45,6 @@ class WorkflowDataUpdateAttributes
     # If a Webhook trigger is defined on this workflow, a webhookSecret is required and should be provided here.
     attr_accessor :webhook_secret
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -85,14 +83,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::WorkflowDataUpdateAttributes` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::WorkflowDataUpdateAttributes`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'created_at')
@@ -130,26 +126,6 @@ def initialize(attributes = {})
       end
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -163,15 +139,14 @@ def ==(o)
           spec == o.spec &&
           tags == o.tags &&
           updated_at == o.updated_at &&
-          webhook_secret == o.webhook_secret &&
-          additional_properties == o.additional_properties
+          webhook_secret == o.webhook_secret
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [created_at, description, name, published, spec, tags, updated_at, webhook_secret, additional_properties].hash
+      [created_at, description, name, published, spec, tags, updated_at, webhook_secret].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/workflow_trigger_wrapper.rb b/lib/datadog_api_client/v2/models/workflow_trigger_wrapper.rb
index ff9203fba10a..ff78fc921123 100644
--- a/lib/datadog_api_client/v2/models/workflow_trigger_wrapper.rb
+++ b/lib/datadog_api_client/v2/models/workflow_trigger_wrapper.rb
@@ -27,8 +27,6 @@ class WorkflowTriggerWrapper
     # Trigger a workflow VIA the Datadog UI. Only required if no other trigger exists.
     attr_reader :workflow_trigger
 
-    attr_accessor :additional_properties
-
     # Attribute mapping from ruby-style variable name to JSON key.
     # @!visibility private
     def self.attribute_map
@@ -55,14 +53,12 @@ def initialize(attributes = {})
         fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::WorkflowTriggerWrapper` initialize method"
       end
 
-      self.additional_properties = {}
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::WorkflowTriggerWrapper`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
       }
 
       if attributes.key?(:'start_step_names')
@@ -94,26 +90,6 @@ def workflow_trigger=(workflow_trigger)
       @workflow_trigger = workflow_trigger
     end
 
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
     # Checks equality by comparing each attribute.
     # @param o [Object] Object to be compared
     # @!visibility private
@@ -121,15 +97,14 @@ def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           start_step_names == o.start_step_names &&
-          workflow_trigger == o.workflow_trigger &&
-          additional_properties == o.additional_properties
+          workflow_trigger == o.workflow_trigger
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [start_step_names, workflow_trigger, additional_properties].hash
+      [start_step_names, workflow_trigger].hash
     end
   end
 end