diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
index 2edf1bf15af06da321694c47ddcc152e818062fe..c166c43f466f9698e6e056eda59bd9c95b91ec41 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -2264,6 +2264,11 @@ public class DefaultCodegen implements CodegenConfig {
 
     Map<NamedSchema, CodegenProperty> schemaCodegenPropertyCache = new HashMap<NamedSchema, CodegenProperty>();
 
+    protected void accumulatePropertiesAndRequiredPropertiesFromComposedSchema(Map<String, Schema> properties, List<String> required, Schema refSchema, Map<String, Schema> allProperties, List<String> allRequired) {
+        addProperties(properties, required, refSchema);
+        addProperties(allProperties, allRequired, refSchema);
+    }
+
     /**
      * Convert OAS Model object to Codegen Model object.
      *
@@ -2442,8 +2447,7 @@ public class DefaultCodegen implements CodegenConfig {
                             addProperties(allProperties, allRequired, refSchema);
                         } else {
                             // composition
-                            addProperties(properties, required, refSchema);
-                            addProperties(allProperties, allRequired, refSchema);
+                            accumulatePropertiesAndRequiredPropertiesFromComposedSchema(properties, required, refSchema, allProperties, allRequired);
                         }
                     }
 
@@ -2495,7 +2499,6 @@ public class DefaultCodegen implements CodegenConfig {
             }
 
             addVars(m, unaliasPropertySchema(properties), required, unaliasPropertySchema(allProperties), allRequired);
-
             // Per OAS specification, composed schemas may use the 'additionalProperties' keyword.
             if (supportsAdditionalPropertiesWithComposedSchema) {
                 // Process the schema specified with the 'additionalProperties' keyword.
@@ -2620,7 +2623,7 @@ public class DefaultCodegen implements CodegenConfig {
         return m;
     }
 
-    private void setAddProps(Schema schema, IJsonSchemaValidationProperties property){
+    protected void setAddProps(Schema schema, IJsonSchemaValidationProperties property){
         if (schema.equals(new Schema())) {
             // if we are trying to set additionalProperties on an empty schema stop recursing
             return;
@@ -4856,7 +4859,7 @@ public class DefaultCodegen implements CodegenConfig {
      * @param properties a map of properties (schema)
      * @param mandatory  a set of required properties' name
      */
-    private void addVars(IJsonSchemaValidationProperties m, List<CodegenProperty> vars, Map<String, Schema> properties, Set<String> mandatory) {
+    protected void addVars(IJsonSchemaValidationProperties m, List<CodegenProperty> vars, Map<String, Schema> properties, Set<String> mandatory) {
         if (properties == null) {
             return;
         }
@@ -6175,7 +6178,7 @@ public class DefaultCodegen implements CodegenConfig {
         return codegenParameter;
     }
 
-    private void addVarsRequiredVarsAdditionalProps(Schema schema, IJsonSchemaValidationProperties property){
+    protected void addVarsRequiredVarsAdditionalProps(Schema schema, IJsonSchemaValidationProperties property){
         setAddProps(schema, property);
         if (!"object".equals(schema.getType())) {
             return;
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java
index a00683cbd4a008a82b589225a25b0b0d64770adf..c3a48c4961f20baee39da99e52b54fee83967ce6 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java
@@ -46,6 +46,7 @@ import java.io.File;
 import java.util.*;
 import java.util.regex.Pattern;
 import java.util.regex.Matcher;
+import java.util.stream.Collectors;
 
 import static org.openapitools.codegen.utils.OnceLogger.once;
 
@@ -182,6 +183,16 @@ public class PythonClientCodegen extends PythonLegacyClientCodegen {
         }
         this.setDisallowAdditionalPropertiesIfNotPresent(disallowAddProps);
 
+        /*
+        in this generator we turn these off because
+        each schema should be validated independently across schemas per OpenApi
+        also schemas can have variable name collisions across schemas
+        so property a can have type int in one schema and string in another
+        Turning these off allows each of the a definitions to remain separate and to not be stuffed into and collide in
+        a composed schema
+         */
+        this.supportsInheritance = false;
+        this.supportsMultipleInheritance = false;
 
         // check library option to ensure only urllib3 is supported
         if (!DEFAULT_LIBRARY.equals(getLibrary())) {
@@ -668,6 +679,18 @@ public class PythonClientCodegen extends PythonLegacyClientCodegen {
         model.dataType = getTypeString(schema, "", "", referencedModelNames);
     }
 
+    @Override
+    protected void accumulatePropertiesAndRequiredPropertiesFromComposedSchema(Map<String, Schema> properties, List<String> required, Schema refSchema, Map<String, Schema> allProperties, List<String> allRequired) {
+        /*
+        in this generator we turn these off because
+        each schema should be validated independently across schemas per OpenApi
+        also schemas can have variable name collisions across schemas
+        so property a can have type int in one schema and string in another
+        Turning these off allows each of the a definitions to remain separate and to not be stuffed into and collide in
+        a composed schema
+         */
+    }
+
     /**
      * Convert OAS Model object to Codegen Model object
      * We have a custom version of this method so we can:
@@ -1493,4 +1516,55 @@ public class PythonClientCodegen extends PythonLegacyClientCodegen {
         }
         return modelNameToSchemaCache;
     }
+
+    @Override
+    protected void addVarsRequiredVarsAdditionalProps(Schema schema, IJsonSchemaValidationProperties property){
+        setAddProps(schema, property);
+        if (schema instanceof ComposedSchema && supportsAdditionalPropertiesWithComposedSchema) {
+            // if schema has properties outside of allOf/oneOf/anyOf also add them
+            ComposedSchema cs = (ComposedSchema) schema;
+            if (schema.getProperties() != null && !schema.getProperties().isEmpty()) {
+                if (cs.getOneOf() != null && !cs.getOneOf().isEmpty()) {
+                    LOGGER.warn("'oneOf' is intended to include only the additional optional OAS extension discriminator object. " +
+                            "For more details, see https://json-schema.org/draft/2019-09/json-schema-core.html#rfc.section.9.2.1.3 and the OAS section on 'Composition and Inheritance'.");
+                }
+                HashSet<String> requiredVars = new HashSet<>();
+                if (schema.getRequired() != null) {
+                    requiredVars.addAll(schema.getRequired());
+                }
+                addVars(property, property.getVars(), schema.getProperties(), requiredVars);
+            }
+            return;
+        }
+        if (!"object".equals(schema.getType())) {
+            return;
+        }
+        if (schema instanceof ObjectSchema) {
+            ObjectSchema objSchema = (ObjectSchema) schema;
+            HashSet<String> requiredVars = new HashSet<>();
+            if (objSchema.getRequired() != null) {
+                requiredVars.addAll(objSchema.getRequired());
+            }
+            addVars(property, property.getVars(), objSchema.getProperties(), requiredVars);
+            List<CodegenProperty> requireCpVars = property.getVars()
+                    .stream()
+                    .filter(p -> Boolean.TRUE.equals(p.required)).collect(Collectors.toList());
+            property.setRequiredVars(requireCpVars);
+        }
+        if (schema.getAdditionalProperties() == null) {
+            if (!disallowAdditionalPropertiesIfNotPresent) {
+                CodegenProperty cp = fromProperty("",  new Schema());
+                property.setAdditionalProperties(cp);
+            }
+        } else if (schema.getAdditionalProperties() instanceof Boolean) {
+            if (Boolean.TRUE.equals(schema.getAdditionalProperties())) {
+                CodegenProperty cp = fromProperty("", new Schema());
+                property.setAdditionalProperties(cp);
+            }
+        } else {
+            CodegenProperty cp = fromProperty("", (Schema) schema.getAdditionalProperties());
+            property.setAdditionalProperties(cp);
+        }
+        return;
+    }
 }
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonClientTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonClientTest.java
index 842d6a2851a37c21ddb594eeed5f440b2692f709..8924e37af47f6c1db6c6170a4aefa7afca9db631 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonClientTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonClientTest.java
@@ -40,6 +40,8 @@ import org.openapitools.codegen.utils.ModelUtils;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import static org.testng.Assert.assertEquals;
+
 @SuppressWarnings("static-method")
 public class PythonClientTest {
 
@@ -464,4 +466,148 @@ public class PythonClientTest {
 
     }
 
+    @Test
+    public void testModelVarsCorrect() {
+        final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_8813.yaml");
+        final DefaultCodegen codegen = new PythonClientCodegen();
+        codegen.setOpenAPI(openAPI);
+
+        String modelName;
+        Schema sc;
+        CodegenModel cm;
+
+        modelName = "ObjectNoProps";
+        sc = openAPI.getComponents().getSchemas().get(modelName);
+        cm = codegen.fromModel(modelName, sc);
+        assertEquals(cm.vars.size(), 0);
+
+        modelName = "ObjectWithABProps";
+        sc = openAPI.getComponents().getSchemas().get(modelName);
+        cm = codegen.fromModel(modelName, sc);
+        assertEquals(cm.vars.size(), 2);
+
+        modelName = "ObjectWithCDProps";
+        sc = openAPI.getComponents().getSchemas().get(modelName);
+        cm = codegen.fromModel(modelName, sc);
+        assertEquals(cm.vars.size(), 2);
+
+        modelName = "ComposedOneOfNoProps";
+        sc = openAPI.getComponents().getSchemas().get(modelName);
+        cm = codegen.fromModel(modelName, sc);
+        assertEquals(cm.vars.size(), 0);
+
+        modelName = "ComposedAnyOfNoProps";
+        sc = openAPI.getComponents().getSchemas().get(modelName);
+        cm = codegen.fromModel(modelName, sc);
+        assertEquals(cm.vars.size(), 0);
+
+        modelName = "ComposedAllOfNoProps";
+        sc = openAPI.getComponents().getSchemas().get(modelName);
+        cm = codegen.fromModel(modelName, sc);
+        assertEquals(cm.vars.size(), 0);
+
+        modelName = "ComposedOneOfWithProps";
+        sc = openAPI.getComponents().getSchemas().get(modelName);
+        cm = codegen.fromModel(modelName, sc);
+        assertEquals(cm.vars.size(), 2);
+
+        modelName = "ComposedAnyOfWithProps";
+        sc = openAPI.getComponents().getSchemas().get(modelName);
+        cm = codegen.fromModel(modelName, sc);
+        assertEquals(cm.vars.size(), 2);
+
+        modelName = "ComposedAllOfWithProps";
+        sc = openAPI.getComponents().getSchemas().get(modelName);
+        cm = codegen.fromModel(modelName, sc);
+        assertEquals(cm.vars.size(), 2);
+    }
+
+    @Test
+    public void testPropertyVarsCorrect() {
+        final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_8813.yaml");
+        final DefaultCodegen codegen = new PythonClientCodegen();
+        codegen.setOpenAPI(openAPI);
+
+        String modelName;
+        Schema sc;
+        CodegenModel cm;
+
+        modelName = "OpjectWithPropsInObjectProps";
+        sc = openAPI.getComponents().getSchemas().get(modelName);
+        cm = codegen.fromModel(modelName, sc);
+        assertEquals(cm.vars.get(0).vars.size(), 0); // ObjectNoProps
+        // these are complexTypes so vars will not be accurate
+        // assertEquals(cm.vars.get(1).vars.size(), 2); // ObjectWithABProps
+        // assertEquals(cm.vars.get(2).vars.size(), 2); // ObjectWithCDProps
+        assertEquals(cm.vars.get(3).vars.size(), 0); // ComposedOneOfNoProps
+        assertEquals(cm.vars.get(4).vars.size(), 0); // ComposedAnyOfNoProps
+        assertEquals(cm.vars.get(5).vars.size(), 0); // ComposedAllOfNoProps
+        assertEquals(cm.vars.get(6).vars.size(), 2); // ComposedOneOfWithProps
+        assertEquals(cm.vars.get(7).vars.size(), 2); // ComposedAnyOfWithProps
+        assertEquals(cm.vars.get(8).vars.size(), 2); // ComposedAllOfWithProps
+    }
+
+    @Test
+    public void testQueryParameterVarsCorrect() {
+        final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_8813.yaml");
+        final DefaultCodegen codegen = new PythonClientCodegen();
+        codegen.setOpenAPI(openAPI);
+
+
+        final String path = "/queryParamVars";
+        final Operation operation = openAPI.getPaths().get(path).getGet();
+        final CodegenOperation co = codegen.fromOperation(path, "get", operation, null);
+
+        assertEquals(co.queryParams.get(0).vars.size(), 0); // ObjectNoProps
+        // these are complexTypes so vars will not be accurate
+        // assertEquals(co.queryParams.get(1).vars.size(), 2); // ObjectWithABProps
+        // assertEquals(co.queryParams.get(2).vars.size(), 2); // ObjectWithCDProps
+        assertEquals(co.queryParams.get(3).vars.size(), 0); // ComposedOneOfNoProps
+        assertEquals(co.queryParams.get(4).vars.size(), 0); // ComposedAnyOfNoProps
+        assertEquals(co.queryParams.get(5).vars.size(), 0); // ComposedAllOfNoProps
+        assertEquals(co.queryParams.get(6).vars.size(), 2); // ComposedOneOfWithProps
+        assertEquals(co.queryParams.get(7).vars.size(), 2); // ComposedAnyOfWithProps
+        assertEquals(co.queryParams.get(8).vars.size(), 2); // ComposedAllOfWithProps
+    }
+
+    @Test
+    public void testBodyParamAndResponseVarsCorrect() {
+        final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_8813.yaml");
+        final DefaultCodegen codegen = new PythonClientCodegen();
+        codegen.setOpenAPI(openAPI);
+
+        String path;
+        Operation op;
+        CodegenOperation co;
+
+        path = "/ComposedOneOfNoProps";
+        op = openAPI.getPaths().get(path).getPost();
+        co = codegen.fromOperation(path, "post", op, null);
+        assertEquals(co.bodyParam.vars.size(), 0);
+        assertEquals(co.responses.get(0).vars.size(), 0);
+
+        path = "/ComposedAnyOfNoProps";
+        op = openAPI.getPaths().get(path).getPost();
+        co = codegen.fromOperation(path, "post", op, null);
+        assertEquals(co.bodyParam.vars.size(), 0);
+        assertEquals(co.responses.get(0).vars.size(), 0);
+
+        path = "/ComposedAllOfNoProps";
+        op = openAPI.getPaths().get(path).getPost();
+        co = codegen.fromOperation(path, "post", op, null);
+        assertEquals(co.bodyParam.vars.size(), 0);
+        assertEquals(co.responses.get(0).vars.size(), 0);
+
+        path = "/ComposedOneOfWithProps";
+        op = openAPI.getPaths().get(path).getPost();
+        co = codegen.fromOperation(path, "post", op, null);
+        assertEquals(co.bodyParam.vars.size(), 2);
+        assertEquals(co.responses.get(0).vars.size(), 2);
+
+        path = "/ComposedAllOfWithProps";
+        op = openAPI.getPaths().get(path).getPost();
+        co = codegen.fromOperation(path, "post", op, null);
+        assertEquals(co.bodyParam.vars.size(), 2);
+        assertEquals(co.responses.get(0).vars.size(), 2);
+    }
 }
diff --git a/modules/openapi-generator/src/test/resources/3_0/issue_8813.yaml b/modules/openapi-generator/src/test/resources/3_0/issue_8813.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..9f9e3cb92ec7c6a4eed66b302b56f727882495c6
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/3_0/issue_8813.yaml
@@ -0,0 +1,343 @@
+openapi: 3.0.0
+info:
+  title: foo
+  version: 1.0.0
+paths:
+  /queryParamVars:
+    get:
+      responses:
+        '200':
+          description: Successful response
+      parameters:
+        - in: query
+          name: ObjectNoProps
+          schema:
+            type: object
+        - in: query
+          name: ObjectWithABProps
+          schema:
+            type: object
+            properties:
+              a:
+                type: integer
+              b:
+                type: string
+        - in: query
+          name: ObjectWithCDProps
+          schema:
+            type: object
+            properties:
+              c:
+                type: integer
+              d:
+                type: string
+        - in: query
+          name: ComposedOneOfNoProps
+          schema:
+            oneOf:
+              - $ref: '#/components/schemas/ObjectWithABProps'
+              - $ref: '#/components/schemas/ObjectWithCDProps'
+        - in: query
+          name: ComposedAnyOfNoProps
+          schema:
+            anyOf:
+              - $ref: '#/components/schemas/ObjectWithABProps'
+              - $ref: '#/components/schemas/ObjectWithCDProps'
+        - in: query
+          name: ComposedAllOfNoProps
+          schema:
+            allOf:
+              - $ref: '#/components/schemas/ObjectWithABProps'
+              - $ref: '#/components/schemas/ObjectWithCDProps'
+        - in: query
+          name: ComposedOneOfWithProps
+          schema:
+            properties:
+              e:
+                type: integer
+              f:
+                type: string
+            oneOf:
+              - $ref: '#/components/schemas/ObjectWithABProps'
+              - $ref: '#/components/schemas/ObjectWithCDProps'
+
+        - in: query
+          name: ComposedAnyOfWithProps
+          schema:
+            properties:
+              e:
+                type: integer
+              f:
+                type: string
+            anyOf:
+              - $ref: '#/components/schemas/ObjectWithABProps'
+              - $ref: '#/components/schemas/ObjectWithCDProps'
+        - in: query
+          name: ComposedAllOfWithProps
+          schema:
+            properties:
+              e:
+                type: integer
+              f:
+                type: string
+            allOf:
+              - $ref: '#/components/schemas/ObjectWithABProps'
+              - $ref: '#/components/schemas/ObjectWithCDProps'
+  /ComposedOneOfNoProps:
+    post:
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              oneOf:
+                - $ref: '#/components/schemas/ObjectWithABProps'
+                - $ref: '#/components/schemas/ObjectWithCDProps'
+      responses:
+        '200':
+          description: Successful response
+          content:
+            application/json:
+              schema:
+                oneOf:
+                  - $ref: '#/components/schemas/ObjectWithABProps'
+                  - $ref: '#/components/schemas/ObjectWithCDProps'
+  /ComposedAnyOfNoProps:
+    post:
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              anyOf:
+                - $ref: '#/components/schemas/ObjectWithABProps'
+                - $ref: '#/components/schemas/ObjectWithCDProps'
+      responses:
+        '200':
+          description: Successful response
+          content:
+            application/json:
+              schema:
+                anyOf:
+                  - $ref: '#/components/schemas/ObjectWithABProps'
+                  - $ref: '#/components/schemas/ObjectWithCDProps'
+  /ComposedAllOfNoProps:
+    post:
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              allOf:
+                - $ref: '#/components/schemas/ObjectWithABProps'
+                - $ref: '#/components/schemas/ObjectWithCDProps'
+      responses:
+        '200':
+          description: Successful response
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - $ref: '#/components/schemas/ObjectWithABProps'
+                  - $ref: '#/components/schemas/ObjectWithCDProps'
+  /ComposedOneOfWithProps:
+    post:
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              properties:
+                e:
+                  type: integer
+                f:
+                  type: string
+              oneOf:
+                - $ref: '#/components/schemas/ObjectWithABProps'
+                - $ref: '#/components/schemas/ObjectWithCDProps'
+      responses:
+        '200':
+          description: Successful response
+          content:
+            application/json:
+              schema:
+                properties:
+                  e:
+                    type: integer
+                  f:
+                    type: string
+                oneOf:
+                  - $ref: '#/components/schemas/ObjectWithABProps'
+                  - $ref: '#/components/schemas/ObjectWithCDProps'
+  /ComposedAnyOfWithProps:
+    post:
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              properties:
+                e:
+                  type: integer
+                f:
+                  type: string
+              anyOf:
+                - $ref: '#/components/schemas/ObjectWithABProps'
+                - $ref: '#/components/schemas/ObjectWithCDProps'
+      responses:
+        '200':
+          description: Successful response
+          content:
+            application/json:
+              schema:
+                properties:
+                  e:
+                    type: integer
+                  f:
+                    type: string
+                anyOf:
+                  - $ref: '#/components/schemas/ObjectWithABProps'
+                  - $ref: '#/components/schemas/ObjectWithCDProps'
+  /ComposedAllOfWithProps:
+    post:
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              properties:
+                e:
+                  type: integer
+                f:
+                  type: string
+              allOf:
+                - $ref: '#/components/schemas/ObjectWithABProps'
+                - $ref: '#/components/schemas/ObjectWithCDProps'
+      responses:
+        '200':
+          description: Successful response
+          content:
+            application/json:
+              schema:
+                properties:
+                  e:
+                    type: integer
+                  f:
+                    type: string
+                allOf:
+                  - $ref: '#/components/schemas/ObjectWithABProps'
+                  - $ref: '#/components/schemas/ObjectWithCDProps'
+components:
+  schemas:
+    ObjectNoProps:
+      type: object
+    ObjectWithABProps:
+      type: object
+      properties:
+        a:
+          type: integer
+        b:
+          type: string
+    ObjectWithCDProps:
+      type: object
+      properties:
+        c:
+          type: integer
+        d:
+          type: string
+    ComposedOneOfNoProps:
+      oneOf:
+        - $ref: '#/components/schemas/ObjectWithABProps'
+        - $ref: '#/components/schemas/ObjectWithCDProps'
+    ComposedAnyOfNoProps:
+      anyOf:
+        - $ref: '#/components/schemas/ObjectWithABProps'
+        - $ref: '#/components/schemas/ObjectWithCDProps'
+    ComposedAllOfNoProps:
+      allOf:
+        - $ref: '#/components/schemas/ObjectWithABProps'
+        - $ref: '#/components/schemas/ObjectWithCDProps'
+    ComposedOneOfWithProps:
+      properties:
+        e:
+          type: integer
+        f:
+          type: string
+      oneOf:
+        - $ref: '#/components/schemas/ObjectWithABProps'
+        - $ref: '#/components/schemas/ObjectWithCDProps'
+    ComposedAnyOfWithProps:
+      properties:
+        e:
+          type: integer
+        f:
+          type: string
+      anyOf:
+        - $ref: '#/components/schemas/ObjectWithABProps'
+        - $ref: '#/components/schemas/ObjectWithCDProps'
+    ComposedAllOfWithProps:
+      properties:
+        e:
+          type: integer
+        f:
+          type: string
+      allOf:
+        - $ref: '#/components/schemas/ObjectWithABProps'
+        - $ref: '#/components/schemas/ObjectWithCDProps'
+    OpjectWithPropsInObjectProps:
+      properties:
+        ObjectNoProps:
+          type: object
+        ObjectWithABProps:
+          type: object
+          properties:
+            a:
+              type: integer
+            b:
+              type: string
+        ObjectWithCDProps:
+          type: object
+          properties:
+            c:
+              type: integer
+            d:
+              type: string
+        ComposedOneOfNoProps:
+          oneOf:
+            - $ref: '#/components/schemas/ObjectWithABProps'
+            - $ref: '#/components/schemas/ObjectWithCDProps'
+        ComposedAnyOfNoProps:
+          anyOf:
+            - $ref: '#/components/schemas/ObjectWithABProps'
+            - $ref: '#/components/schemas/ObjectWithCDProps'
+        ComposedAllOfNoProps:
+          allOf:
+            - $ref: '#/components/schemas/ObjectWithABProps'
+            - $ref: '#/components/schemas/ObjectWithCDProps'
+        ComposedOneOfWithProps:
+          properties:
+            e:
+              type: integer
+            f:
+              type: string
+          oneOf:
+            - $ref: '#/components/schemas/ObjectWithABProps'
+            - $ref: '#/components/schemas/ObjectWithCDProps'
+        ComposedAnyOfWithProps:
+          properties:
+            e:
+              type: integer
+            f:
+              type: string
+          anyOf:
+            - $ref: '#/components/schemas/ObjectWithABProps'
+            - $ref: '#/components/schemas/ObjectWithCDProps'
+        ComposedAllOfWithProps:
+          properties:
+            e:
+              type: integer
+            f:
+              type: string
+          allOf:
+            - $ref: '#/components/schemas/ObjectWithABProps'
+            - $ref: '#/components/schemas/ObjectWithCDProps'
diff --git a/samples/openapi3/client/petstore/python/.openapi-generator/VERSION b/samples/openapi3/client/petstore/python/.openapi-generator/VERSION
index 6555596f931149bc73ff7b8c2d0ab3985c120e26..717311e32e3c20b84e97a3643848fd8473d5b835 100644
--- a/samples/openapi3/client/petstore/python/.openapi-generator/VERSION
+++ b/samples/openapi3/client/petstore/python/.openapi-generator/VERSION
@@ -1 +1 @@
-5.2.0-SNAPSHOT
\ No newline at end of file
+unset
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/python/docs/Cat.md b/samples/openapi3/client/petstore/python/docs/Cat.md
index 082715a28421390d671a191a6546d82746a3503a..df94d5ad3dd5de17c8a1ae0b03ce926ed678c933 100644
--- a/samples/openapi3/client/petstore/python/docs/Cat.md
+++ b/samples/openapi3/client/petstore/python/docs/Cat.md
@@ -4,9 +4,6 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**class_name** | **str** |  | 
-**declawed** | **bool** |  | [optional] 
-**color** | **str** |  | [optional]  if omitted the server will use the default value of "red"
 **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/openapi3/client/petstore/python/docs/ChildCat.md b/samples/openapi3/client/petstore/python/docs/ChildCat.md
index 513903ac5793ab7d5a5359b15df222bddae68a44..a369aa9723859e8c2a34987893bc5e3033e9f2da 100644
--- a/samples/openapi3/client/petstore/python/docs/ChildCat.md
+++ b/samples/openapi3/client/petstore/python/docs/ChildCat.md
@@ -4,8 +4,6 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**pet_type** | **str** |  | 
-**name** | **str** |  | [optional] 
 **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/openapi3/client/petstore/python/docs/ComplexQuadrilateral.md b/samples/openapi3/client/petstore/python/docs/ComplexQuadrilateral.md
index d9fef9ca283b1fa6e48fe9bf084c787a6bc51afd..93e9caf37c9e30da841505549e82cdee877fe4be 100644
--- a/samples/openapi3/client/petstore/python/docs/ComplexQuadrilateral.md
+++ b/samples/openapi3/client/petstore/python/docs/ComplexQuadrilateral.md
@@ -4,8 +4,6 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**shape_type** | **str** |  | 
-**quadrilateral_type** | **str** |  | 
 **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/openapi3/client/petstore/python/docs/ComposedOneOfNumberWithValidations.md b/samples/openapi3/client/petstore/python/docs/ComposedOneOfNumberWithValidations.md
index 14c3f2ea49337a9f6c77428519c1c63df9af9a8a..4a5c6562ca390d1ad6ff845f9316efc0d1ec166e 100644
--- a/samples/openapi3/client/petstore/python/docs/ComposedOneOfNumberWithValidations.md
+++ b/samples/openapi3/client/petstore/python/docs/ComposedOneOfNumberWithValidations.md
@@ -5,8 +5,6 @@ this is a model that allows payloads of type object or number
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**color** | **str** |  | [optional]  if omitted the server will use the default value of "red"
-**class_name** | **str** |  | [optional] 
 **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/openapi3/client/petstore/python/docs/ComposedSchemaWithPropsAndNoAddProps.md b/samples/openapi3/client/petstore/python/docs/ComposedSchemaWithPropsAndNoAddProps.md
index 5930b762b0c222c9c68d8af7c4ee7cfd99d4ca2d..854f42ec72def9cd4638fd68008a423dc7b925c1 100644
--- a/samples/openapi3/client/petstore/python/docs/ComposedSchemaWithPropsAndNoAddProps.md
+++ b/samples/openapi3/client/petstore/python/docs/ComposedSchemaWithPropsAndNoAddProps.md
@@ -5,8 +5,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **color** | **str** |  | [optional] 
-**id** | **int** |  | [optional] 
-**name** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/openapi3/client/petstore/python/docs/Dog.md b/samples/openapi3/client/petstore/python/docs/Dog.md
index 51b5b32bdacbb39c4334b2fa18b7c3f2db6a1323..05b8006396b7fd3467ab0e943526cc942f3526e7 100644
--- a/samples/openapi3/client/petstore/python/docs/Dog.md
+++ b/samples/openapi3/client/petstore/python/docs/Dog.md
@@ -4,9 +4,6 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**class_name** | **str** |  | 
-**breed** | **str** |  | [optional] 
-**color** | **str** |  | [optional]  if omitted the server will use the default value of "red"
 **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/openapi3/client/petstore/python/docs/EquilateralTriangle.md b/samples/openapi3/client/petstore/python/docs/EquilateralTriangle.md
index 2766ad71cefc2c38da8f58901a0c16e8c88897a2..7f199002d5c38f1926b5dc672ffc325a6175f02c 100644
--- a/samples/openapi3/client/petstore/python/docs/EquilateralTriangle.md
+++ b/samples/openapi3/client/petstore/python/docs/EquilateralTriangle.md
@@ -4,8 +4,6 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**shape_type** | **str** |  | 
-**triangle_type** | **str** |  | 
 **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/openapi3/client/petstore/python/docs/Fruit.md b/samples/openapi3/client/petstore/python/docs/Fruit.md
index d65f4cb14b4f8de0a29340828a47a4db00c26996..59b47959d096a831810d894acc8c2a28e83b4198 100644
--- a/samples/openapi3/client/petstore/python/docs/Fruit.md
+++ b/samples/openapi3/client/petstore/python/docs/Fruit.md
@@ -5,10 +5,7 @@ a schema that tests oneOf and includes a schema level property
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**cultivar** | **str** |  | 
-**length_cm** | **float** |  | 
 **color** | **str** |  | [optional] 
-**origin** | **str** |  | [optional] 
 **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/openapi3/client/petstore/python/docs/FruitReq.md b/samples/openapi3/client/petstore/python/docs/FruitReq.md
index 096dde57309100cbee57547c64fbca591f7d79cb..81873ad7a63e6132d49ad06ed9a3be942d65940e 100644
--- a/samples/openapi3/client/petstore/python/docs/FruitReq.md
+++ b/samples/openapi3/client/petstore/python/docs/FruitReq.md
@@ -5,10 +5,6 @@ a schema where additionalProperties is on in the composed schema and off in the
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**mealy** | **bool** |  | [optional] 
-**sweet** | **bool** |  | [optional] 
-**cultivar** | **str** |  | [optional] 
-**length_cm** | **float** |  | [optional] 
 **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/openapi3/client/petstore/python/docs/GmFruit.md b/samples/openapi3/client/petstore/python/docs/GmFruit.md
index 4da4dd53ad441204dd1ec42c07a6dc3cf9738dea..e6ca88e11a88c5e4e623f006fd4523ca1c849881 100644
--- a/samples/openapi3/client/petstore/python/docs/GmFruit.md
+++ b/samples/openapi3/client/petstore/python/docs/GmFruit.md
@@ -4,10 +4,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**cultivar** | **str** |  | 
-**length_cm** | **float** |  | 
 **color** | **str** |  | [optional] 
-**origin** | **str** |  | [optional] 
 **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/openapi3/client/petstore/python/docs/IsoscelesTriangle.md b/samples/openapi3/client/petstore/python/docs/IsoscelesTriangle.md
index 57cfa6d12ad15b3641419c9776ac6abe9c2c002d..2b1feffee05be23565ef41b4232b041a7aa2ef96 100644
--- a/samples/openapi3/client/petstore/python/docs/IsoscelesTriangle.md
+++ b/samples/openapi3/client/petstore/python/docs/IsoscelesTriangle.md
@@ -4,8 +4,6 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**shape_type** | **str** |  | 
-**triangle_type** | **str** |  | 
 **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/openapi3/client/petstore/python/docs/Mammal.md b/samples/openapi3/client/petstore/python/docs/Mammal.md
index 4d9d8cc52040f1e84fd82c554a482c9452a0643d..be44f066dac618b9ddd868d631423b410c09fa10 100644
--- a/samples/openapi3/client/petstore/python/docs/Mammal.md
+++ b/samples/openapi3/client/petstore/python/docs/Mammal.md
@@ -4,10 +4,6 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**class_name** | **str** |  | 
-**has_baleen** | **bool** |  | [optional] 
-**has_teeth** | **bool** |  | [optional] 
-**type** | **str** |  | [optional] 
 **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/openapi3/client/petstore/python/docs/NullableShape.md b/samples/openapi3/client/petstore/python/docs/NullableShape.md
index a1c658a393460d6e42ae1392baa215bc389ad38d..641f26bac3427dacc02eb3e607f5970c108845c5 100644
--- a/samples/openapi3/client/petstore/python/docs/NullableShape.md
+++ b/samples/openapi3/client/petstore/python/docs/NullableShape.md
@@ -5,9 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**shape_type** | **str** |  | 
-**quadrilateral_type** | **str** |  | [optional] 
-**triangle_type** | **str** |  | [optional] 
 **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/openapi3/client/petstore/python/docs/ParentPet.md b/samples/openapi3/client/petstore/python/docs/ParentPet.md
index 111ada88b3d1f209aea5942d3ee1d146c3878599..fe8afb104511a25239161a722e62c41cec7306a1 100644
--- a/samples/openapi3/client/petstore/python/docs/ParentPet.md
+++ b/samples/openapi3/client/petstore/python/docs/ParentPet.md
@@ -4,7 +4,6 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**pet_type** | **str** |  | 
 **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/openapi3/client/petstore/python/docs/Pig.md b/samples/openapi3/client/petstore/python/docs/Pig.md
index 30b4d17f60ce0c71acb51dc2e05a95d1aaa36bad..0178441f41c2396051f8d89a0cac43f79f45904c 100644
--- a/samples/openapi3/client/petstore/python/docs/Pig.md
+++ b/samples/openapi3/client/petstore/python/docs/Pig.md
@@ -4,7 +4,6 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**class_name** | **str** |  | 
 **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/openapi3/client/petstore/python/docs/Quadrilateral.md b/samples/openapi3/client/petstore/python/docs/Quadrilateral.md
index 7418ca26b4512baf044033f2a34af3eaaede30cf..80dc4c2c6ca286b331a94a10ba0cb9a7a1300b80 100644
--- a/samples/openapi3/client/petstore/python/docs/Quadrilateral.md
+++ b/samples/openapi3/client/petstore/python/docs/Quadrilateral.md
@@ -4,8 +4,6 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**quadrilateral_type** | **str** |  | 
-**shape_type** | **str** |  | [optional] 
 **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/openapi3/client/petstore/python/docs/ScaleneTriangle.md b/samples/openapi3/client/petstore/python/docs/ScaleneTriangle.md
index 0910a264c00abbedffda43c12d8b2d66ed82c997..9bc65474cb83d0a2f4091bb669c30eee9ff584e2 100644
--- a/samples/openapi3/client/petstore/python/docs/ScaleneTriangle.md
+++ b/samples/openapi3/client/petstore/python/docs/ScaleneTriangle.md
@@ -4,8 +4,6 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**shape_type** | **str** |  | 
-**triangle_type** | **str** |  | 
 **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/openapi3/client/petstore/python/docs/Shape.md b/samples/openapi3/client/petstore/python/docs/Shape.md
index fe458b1df03ae104568ce3175e3097a421ea7ed8..c3483fb91555380e09dc8d390602b8e79efe45f5 100644
--- a/samples/openapi3/client/petstore/python/docs/Shape.md
+++ b/samples/openapi3/client/petstore/python/docs/Shape.md
@@ -4,9 +4,6 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**shape_type** | **str** |  | 
-**quadrilateral_type** | **str** |  | [optional] 
-**triangle_type** | **str** |  | [optional] 
 **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/openapi3/client/petstore/python/docs/ShapeOrNull.md b/samples/openapi3/client/petstore/python/docs/ShapeOrNull.md
index ee3fbbdcb25bbcf5c0ca4d37f32304a4f3f6b167..dad4dbc6ab5502ecf526358692b78be514eeef36 100644
--- a/samples/openapi3/client/petstore/python/docs/ShapeOrNull.md
+++ b/samples/openapi3/client/petstore/python/docs/ShapeOrNull.md
@@ -5,9 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**shape_type** | **str** |  | 
-**quadrilateral_type** | **str** |  | [optional] 
-**triangle_type** | **str** |  | [optional] 
 **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/openapi3/client/petstore/python/docs/SimpleQuadrilateral.md b/samples/openapi3/client/petstore/python/docs/SimpleQuadrilateral.md
index 13672f48c96189ae4af344b68151c8778e8de07a..849e9d106bb25b301411ac5f7d95a1e6c38b45a5 100644
--- a/samples/openapi3/client/petstore/python/docs/SimpleQuadrilateral.md
+++ b/samples/openapi3/client/petstore/python/docs/SimpleQuadrilateral.md
@@ -4,8 +4,6 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**shape_type** | **str** |  | 
-**quadrilateral_type** | **str** |  | 
 **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/openapi3/client/petstore/python/docs/Triangle.md b/samples/openapi3/client/petstore/python/docs/Triangle.md
index 85e1d6bb437d56e070ffdf28cec6157ce427d5fe..64a17224187761bf2d3b6d590fb8eeb7f7be11ad 100644
--- a/samples/openapi3/client/petstore/python/docs/Triangle.md
+++ b/samples/openapi3/client/petstore/python/docs/Triangle.md
@@ -4,8 +4,6 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**triangle_type** | **str** |  | 
-**shape_type** | **str** |  | [optional] 
 **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/model/cat.py b/samples/openapi3/client/petstore/python/petstore_api/model/cat.py
index be46fe5abd8ca4d0cbed4aa0364e6c6f5feaf4ec..c3fbae2942b148e5b99bfe713ce64b83a3410d46 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/model/cat.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/model/cat.py
@@ -89,9 +89,6 @@ class Cat(ModelComposed):
         """
         lazy_import()
         return {
-            'class_name': (str,),  # noqa: E501
-            'declawed': (bool,),  # noqa: E501
-            'color': (str,),  # noqa: E501
         }
 
     @cached_property
@@ -103,9 +100,6 @@ class Cat(ModelComposed):
         return {'class_name': val}
 
     attribute_map = {
-        'class_name': 'className',  # noqa: E501
-        'declawed': 'declawed',  # noqa: E501
-        'color': 'color',  # noqa: E501
     }
 
     read_only_vars = {
@@ -117,7 +111,6 @@ class Cat(ModelComposed):
         """Cat - a model defined in OpenAPI
 
         Keyword Args:
-            class_name (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
@@ -148,8 +141,6 @@ class Cat(ModelComposed):
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            declawed (bool): [optional]  # noqa: E501
-            color (str): [optional] if omitted the server will use the default value of "red"  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
@@ -219,7 +210,6 @@ class Cat(ModelComposed):
         """Cat - a model defined in OpenAPI
 
         Keyword Args:
-            class_name (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
@@ -250,8 +240,6 @@ class Cat(ModelComposed):
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            declawed (bool): [optional]  # noqa: E501
-            color (str): [optional] if omitted the server will use the default value of "red"  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/model/child_cat.py b/samples/openapi3/client/petstore/python/petstore_api/model/child_cat.py
index 3644df82fc549df3994697671848713e24008a10..e939fc168a22b046e1f4f761a3db68378c98f9dd 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/model/child_cat.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/model/child_cat.py
@@ -89,8 +89,6 @@ class ChildCat(ModelComposed):
         """
         lazy_import()
         return {
-            'pet_type': (str,),  # noqa: E501
-            'name': (str,),  # noqa: E501
         }
 
     @cached_property
@@ -102,8 +100,6 @@ class ChildCat(ModelComposed):
         return {'pet_type': val}
 
     attribute_map = {
-        'pet_type': 'pet_type',  # noqa: E501
-        'name': 'name',  # noqa: E501
     }
 
     read_only_vars = {
@@ -115,7 +111,6 @@ class ChildCat(ModelComposed):
         """ChildCat - a model defined in OpenAPI
 
         Keyword Args:
-            pet_type (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
@@ -146,7 +141,6 @@ class ChildCat(ModelComposed):
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            name (str): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
@@ -216,7 +210,6 @@ class ChildCat(ModelComposed):
         """ChildCat - a model defined in OpenAPI
 
         Keyword Args:
-            pet_type (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
@@ -247,7 +240,6 @@ class ChildCat(ModelComposed):
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            name (str): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/model/complex_quadrilateral.py b/samples/openapi3/client/petstore/python/petstore_api/model/complex_quadrilateral.py
index bd835d9a39a12f765421b63e903f937294836837..cc5a09191f7cea0ccc74285b730cba2a4f3f7fee 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/model/complex_quadrilateral.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/model/complex_quadrilateral.py
@@ -89,8 +89,6 @@ class ComplexQuadrilateral(ModelComposed):
         """
         lazy_import()
         return {
-            'shape_type': (str,),  # noqa: E501
-            'quadrilateral_type': (str,),  # noqa: E501
         }
 
     @cached_property
@@ -99,8 +97,6 @@ class ComplexQuadrilateral(ModelComposed):
 
 
     attribute_map = {
-        'shape_type': 'shapeType',  # noqa: E501
-        'quadrilateral_type': 'quadrilateralType',  # noqa: E501
     }
 
     read_only_vars = {
@@ -112,8 +108,6 @@ class ComplexQuadrilateral(ModelComposed):
         """ComplexQuadrilateral - a model defined in OpenAPI
 
         Keyword Args:
-            shape_type (str):
-            quadrilateral_type (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
@@ -213,8 +207,6 @@ class ComplexQuadrilateral(ModelComposed):
         """ComplexQuadrilateral - a model defined in OpenAPI
 
         Keyword Args:
-            shape_type (str):
-            quadrilateral_type (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
diff --git a/samples/openapi3/client/petstore/python/petstore_api/model/composed_one_of_number_with_validations.py b/samples/openapi3/client/petstore/python/petstore_api/model/composed_one_of_number_with_validations.py
index 68847c276eee18f7a0fa17089b543b619f8b6a5e..55bd7719e1952f6b8e01fd3007df34d0839a731d 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/model/composed_one_of_number_with_validations.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/model/composed_one_of_number_with_validations.py
@@ -89,8 +89,6 @@ class ComposedOneOfNumberWithValidations(ModelComposed):
         """
         lazy_import()
         return {
-            'color': (str,),  # noqa: E501
-            'class_name': (str,),  # noqa: E501
         }
 
     @cached_property
@@ -99,8 +97,6 @@ class ComposedOneOfNumberWithValidations(ModelComposed):
 
 
     attribute_map = {
-        'color': 'color',  # noqa: E501
-        'class_name': 'className',  # noqa: E501
     }
 
     read_only_vars = {
@@ -142,8 +138,6 @@ class ComposedOneOfNumberWithValidations(ModelComposed):
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            color (str): [optional] if omitted the server will use the default value of "red"  # noqa: E501
-            class_name (str): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
@@ -243,8 +237,6 @@ class ComposedOneOfNumberWithValidations(ModelComposed):
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            color (str): [optional] if omitted the server will use the default value of "red"  # noqa: E501
-            class_name (str): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/model/composed_schema_with_props_and_no_add_props.py b/samples/openapi3/client/petstore/python/petstore_api/model/composed_schema_with_props_and_no_add_props.py
index 2cba94f64090150f7b9a46790b2e5ec4f9f3b416..2734679986c8a73566120fb4b4c59b0f6a3626de 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/model/composed_schema_with_props_and_no_add_props.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/model/composed_schema_with_props_and_no_add_props.py
@@ -81,8 +81,6 @@ class ComposedSchemaWithPropsAndNoAddProps(ModelComposed):
         lazy_import()
         return {
             'color': (str,),  # noqa: E501
-            'id': (int,),  # noqa: E501
-            'name': (str,),  # noqa: E501
         }
 
     @cached_property
@@ -92,8 +90,6 @@ class ComposedSchemaWithPropsAndNoAddProps(ModelComposed):
 
     attribute_map = {
         'color': 'color',  # noqa: E501
-        'id': 'id',  # noqa: E501
-        'name': 'name',  # noqa: E501
     }
 
     read_only_vars = {
@@ -136,8 +132,6 @@ class ComposedSchemaWithPropsAndNoAddProps(ModelComposed):
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
             color (str): [optional]  # noqa: E501
-            id (int): [optional]  # noqa: E501
-            name (str): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
@@ -238,8 +232,6 @@ class ComposedSchemaWithPropsAndNoAddProps(ModelComposed):
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
             color (str): [optional]  # noqa: E501
-            id (int): [optional]  # noqa: E501
-            name (str): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/model/dog.py b/samples/openapi3/client/petstore/python/petstore_api/model/dog.py
index 4a20dafa46ccc66cd904c280fe20e96de1554d62..eb2d1e5d870ffd6db6dc523d000f223aa9efa365 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/model/dog.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/model/dog.py
@@ -89,9 +89,6 @@ class Dog(ModelComposed):
         """
         lazy_import()
         return {
-            'class_name': (str,),  # noqa: E501
-            'breed': (str,),  # noqa: E501
-            'color': (str,),  # noqa: E501
         }
 
     @cached_property
@@ -103,9 +100,6 @@ class Dog(ModelComposed):
         return {'class_name': val}
 
     attribute_map = {
-        'class_name': 'className',  # noqa: E501
-        'breed': 'breed',  # noqa: E501
-        'color': 'color',  # noqa: E501
     }
 
     read_only_vars = {
@@ -117,7 +111,6 @@ class Dog(ModelComposed):
         """Dog - a model defined in OpenAPI
 
         Keyword Args:
-            class_name (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
@@ -148,8 +141,6 @@ class Dog(ModelComposed):
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            breed (str): [optional]  # noqa: E501
-            color (str): [optional] if omitted the server will use the default value of "red"  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
@@ -219,7 +210,6 @@ class Dog(ModelComposed):
         """Dog - a model defined in OpenAPI
 
         Keyword Args:
-            class_name (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
@@ -250,8 +240,6 @@ class Dog(ModelComposed):
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            breed (str): [optional]  # noqa: E501
-            color (str): [optional] if omitted the server will use the default value of "red"  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/model/equilateral_triangle.py b/samples/openapi3/client/petstore/python/petstore_api/model/equilateral_triangle.py
index 54549b9821308ba1079d99e2b95856dd3ee8f2a7..28cacd9a8351617f6b45d9e1fb0494a5be77b5ae 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/model/equilateral_triangle.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/model/equilateral_triangle.py
@@ -89,8 +89,6 @@ class EquilateralTriangle(ModelComposed):
         """
         lazy_import()
         return {
-            'shape_type': (str,),  # noqa: E501
-            'triangle_type': (str,),  # noqa: E501
         }
 
     @cached_property
@@ -99,8 +97,6 @@ class EquilateralTriangle(ModelComposed):
 
 
     attribute_map = {
-        'shape_type': 'shapeType',  # noqa: E501
-        'triangle_type': 'triangleType',  # noqa: E501
     }
 
     read_only_vars = {
@@ -112,8 +108,6 @@ class EquilateralTriangle(ModelComposed):
         """EquilateralTriangle - a model defined in OpenAPI
 
         Keyword Args:
-            shape_type (str):
-            triangle_type (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
@@ -213,8 +207,6 @@ class EquilateralTriangle(ModelComposed):
         """EquilateralTriangle - a model defined in OpenAPI
 
         Keyword Args:
-            shape_type (str):
-            triangle_type (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
diff --git a/samples/openapi3/client/petstore/python/petstore_api/model/fruit.py b/samples/openapi3/client/petstore/python/petstore_api/model/fruit.py
index fedd13c38e47f49c504ccf9a05a2c194b03fc888..242546f83210a9ddbb328e2dff5a0cbd37467897 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/model/fruit.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/model/fruit.py
@@ -64,17 +64,6 @@ class Fruit(ModelComposed):
     }
 
     validations = {
-        ('cultivar',): {
-            'regex': {
-                'pattern': r'^[a-zA-Z\s]*$',  # noqa: E501
-            },
-        },
-        ('origin',): {
-            'regex': {
-                'pattern': r'^[A-Z\s]*$',  # noqa: E501
-                'flags': (re.IGNORECASE)
-            },
-        },
     }
 
     @cached_property
@@ -100,10 +89,7 @@ class Fruit(ModelComposed):
         """
         lazy_import()
         return {
-            'cultivar': (str,),  # noqa: E501
-            'length_cm': (float,),  # noqa: E501
             'color': (str,),  # noqa: E501
-            'origin': (str,),  # noqa: E501
         }
 
     @cached_property
@@ -112,10 +98,7 @@ class Fruit(ModelComposed):
 
 
     attribute_map = {
-        'cultivar': 'cultivar',  # noqa: E501
-        'length_cm': 'lengthCm',  # noqa: E501
         'color': 'color',  # noqa: E501
-        'origin': 'origin',  # noqa: E501
     }
 
     read_only_vars = {
@@ -127,8 +110,6 @@ class Fruit(ModelComposed):
         """Fruit - a model defined in OpenAPI
 
         Keyword Args:
-            cultivar (str):
-            length_cm (float):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
@@ -160,7 +141,6 @@ class Fruit(ModelComposed):
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
             color (str): [optional]  # noqa: E501
-            origin (str): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
@@ -230,8 +210,6 @@ class Fruit(ModelComposed):
         """Fruit - a model defined in OpenAPI
 
         Keyword Args:
-            cultivar (str):
-            length_cm (float):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
@@ -263,7 +241,6 @@ class Fruit(ModelComposed):
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
             color (str): [optional]  # noqa: E501
-            origin (str): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/model/fruit_req.py b/samples/openapi3/client/petstore/python/petstore_api/model/fruit_req.py
index 01b907c5d8cf84b1cc6ffb9998912ecc2f8aa5e1..f384ac9e7fc98bcb12bb8e6906a631a2ce72966d 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/model/fruit_req.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/model/fruit_req.py
@@ -89,10 +89,6 @@ class FruitReq(ModelComposed):
         """
         lazy_import()
         return {
-            'mealy': (bool,),  # noqa: E501
-            'sweet': (bool,),  # noqa: E501
-            'cultivar': (str,),  # noqa: E501
-            'length_cm': (float,),  # noqa: E501
         }
 
     @cached_property
@@ -101,10 +97,6 @@ class FruitReq(ModelComposed):
 
 
     attribute_map = {
-        'mealy': 'mealy',  # noqa: E501
-        'sweet': 'sweet',  # noqa: E501
-        'cultivar': 'cultivar',  # noqa: E501
-        'length_cm': 'lengthCm',  # noqa: E501
     }
 
     read_only_vars = {
@@ -146,10 +138,6 @@ class FruitReq(ModelComposed):
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            mealy (bool): [optional]  # noqa: E501
-            sweet (bool): [optional]  # noqa: E501
-            cultivar (str): [optional]  # noqa: E501
-            length_cm (float): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
@@ -249,10 +237,6 @@ class FruitReq(ModelComposed):
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            mealy (bool): [optional]  # noqa: E501
-            sweet (bool): [optional]  # noqa: E501
-            cultivar (str): [optional]  # noqa: E501
-            length_cm (float): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/model/gm_fruit.py b/samples/openapi3/client/petstore/python/petstore_api/model/gm_fruit.py
index 99efd26f0d4c3147ccc025c5a5055e4cd496118c..5e5db7e16548bbede605e66dadc8951794246630 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/model/gm_fruit.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/model/gm_fruit.py
@@ -64,17 +64,6 @@ class GmFruit(ModelComposed):
     }
 
     validations = {
-        ('cultivar',): {
-            'regex': {
-                'pattern': r'^[a-zA-Z\s]*$',  # noqa: E501
-            },
-        },
-        ('origin',): {
-            'regex': {
-                'pattern': r'^[A-Z\s]*$',  # noqa: E501
-                'flags': (re.IGNORECASE)
-            },
-        },
     }
 
     @cached_property
@@ -100,10 +89,7 @@ class GmFruit(ModelComposed):
         """
         lazy_import()
         return {
-            'cultivar': (str,),  # noqa: E501
-            'length_cm': (float,),  # noqa: E501
             'color': (str,),  # noqa: E501
-            'origin': (str,),  # noqa: E501
         }
 
     @cached_property
@@ -112,10 +98,7 @@ class GmFruit(ModelComposed):
 
 
     attribute_map = {
-        'cultivar': 'cultivar',  # noqa: E501
-        'length_cm': 'lengthCm',  # noqa: E501
         'color': 'color',  # noqa: E501
-        'origin': 'origin',  # noqa: E501
     }
 
     read_only_vars = {
@@ -127,8 +110,6 @@ class GmFruit(ModelComposed):
         """GmFruit - a model defined in OpenAPI
 
         Keyword Args:
-            cultivar (str):
-            length_cm (float):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
@@ -160,7 +141,6 @@ class GmFruit(ModelComposed):
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
             color (str): [optional]  # noqa: E501
-            origin (str): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
@@ -230,8 +210,6 @@ class GmFruit(ModelComposed):
         """GmFruit - a model defined in OpenAPI
 
         Keyword Args:
-            cultivar (str):
-            length_cm (float):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
@@ -263,7 +241,6 @@ class GmFruit(ModelComposed):
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
             color (str): [optional]  # noqa: E501
-            origin (str): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/model/isosceles_triangle.py b/samples/openapi3/client/petstore/python/petstore_api/model/isosceles_triangle.py
index bcbc721c2b6bd0727ab1c7c575131a7b120eb576..7224f60129faa1092e1ab6ca3ec6d605fb27a40e 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/model/isosceles_triangle.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/model/isosceles_triangle.py
@@ -89,8 +89,6 @@ class IsoscelesTriangle(ModelComposed):
         """
         lazy_import()
         return {
-            'shape_type': (str,),  # noqa: E501
-            'triangle_type': (str,),  # noqa: E501
         }
 
     @cached_property
@@ -99,8 +97,6 @@ class IsoscelesTriangle(ModelComposed):
 
 
     attribute_map = {
-        'shape_type': 'shapeType',  # noqa: E501
-        'triangle_type': 'triangleType',  # noqa: E501
     }
 
     read_only_vars = {
@@ -112,8 +108,6 @@ class IsoscelesTriangle(ModelComposed):
         """IsoscelesTriangle - a model defined in OpenAPI
 
         Keyword Args:
-            shape_type (str):
-            triangle_type (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
@@ -213,8 +207,6 @@ class IsoscelesTriangle(ModelComposed):
         """IsoscelesTriangle - a model defined in OpenAPI
 
         Keyword Args:
-            shape_type (str):
-            triangle_type (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
diff --git a/samples/openapi3/client/petstore/python/petstore_api/model/mammal.py b/samples/openapi3/client/petstore/python/petstore_api/model/mammal.py
index 62037474b90aba545913cea8a866b6bcec342e3c..b5e8f060cb1b11f278aedeb62ed11490c7187178 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/model/mammal.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/model/mammal.py
@@ -63,11 +63,6 @@ class Mammal(ModelComposed):
     """
 
     allowed_values = {
-        ('type',): {
-            'PLAINS': "plains",
-            'MOUNTAIN': "mountain",
-            'GREVYS': "grevys",
-        },
     }
 
     validations = {
@@ -96,10 +91,6 @@ class Mammal(ModelComposed):
         """
         lazy_import()
         return {
-            'class_name': (str,),  # noqa: E501
-            'has_baleen': (bool,),  # noqa: E501
-            'has_teeth': (bool,),  # noqa: E501
-            'type': (str,),  # noqa: E501
         }
 
     @cached_property
@@ -115,10 +106,6 @@ class Mammal(ModelComposed):
         return {'class_name': val}
 
     attribute_map = {
-        'class_name': 'className',  # noqa: E501
-        'has_baleen': 'hasBaleen',  # noqa: E501
-        'has_teeth': 'hasTeeth',  # noqa: E501
-        'type': 'type',  # noqa: E501
     }
 
     read_only_vars = {
@@ -130,7 +117,6 @@ class Mammal(ModelComposed):
         """Mammal - a model defined in OpenAPI
 
         Keyword Args:
-            class_name (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
@@ -161,9 +147,6 @@ class Mammal(ModelComposed):
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            has_baleen (bool): [optional]  # noqa: E501
-            has_teeth (bool): [optional]  # noqa: E501
-            type (str): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
@@ -233,7 +216,6 @@ class Mammal(ModelComposed):
         """Mammal - a model defined in OpenAPI
 
         Keyword Args:
-            class_name (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
@@ -264,9 +246,6 @@ class Mammal(ModelComposed):
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            has_baleen (bool): [optional]  # noqa: E501
-            has_teeth (bool): [optional]  # noqa: E501
-            type (str): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/model/nullable_shape.py b/samples/openapi3/client/petstore/python/petstore_api/model/nullable_shape.py
index 6b2a0573ade8e5bed8eb4592c6636c943937059c..e81c0ad3a391026017a9ec14c00e743eef6d05a3 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/model/nullable_shape.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/model/nullable_shape.py
@@ -89,9 +89,6 @@ class NullableShape(ModelComposed):
         """
         lazy_import()
         return {
-            'shape_type': (str,),  # noqa: E501
-            'quadrilateral_type': (str,),  # noqa: E501
-            'triangle_type': (str,),  # noqa: E501
         }
 
     @cached_property
@@ -106,9 +103,6 @@ class NullableShape(ModelComposed):
         return {'shape_type': val}
 
     attribute_map = {
-        'shape_type': 'shapeType',  # noqa: E501
-        'quadrilateral_type': 'quadrilateralType',  # noqa: E501
-        'triangle_type': 'triangleType',  # noqa: E501
     }
 
     read_only_vars = {
@@ -120,7 +114,6 @@ class NullableShape(ModelComposed):
         """NullableShape - a model defined in OpenAPI
 
         Keyword Args:
-            shape_type (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
@@ -151,8 +144,6 @@ class NullableShape(ModelComposed):
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            quadrilateral_type (str): [optional]  # noqa: E501
-            triangle_type (str): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
@@ -222,7 +213,6 @@ class NullableShape(ModelComposed):
         """NullableShape - a model defined in OpenAPI
 
         Keyword Args:
-            shape_type (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
@@ -253,8 +243,6 @@ class NullableShape(ModelComposed):
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            quadrilateral_type (str): [optional]  # noqa: E501
-            triangle_type (str): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/model/parent_pet.py b/samples/openapi3/client/petstore/python/petstore_api/model/parent_pet.py
index ff58abf3d79305ed2ca16904e13c18f94d8cffdb..1e14cf3efa3ae522bd46876e48a7c6a723eb8da4 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/model/parent_pet.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/model/parent_pet.py
@@ -89,7 +89,6 @@ class ParentPet(ModelComposed):
         """
         lazy_import()
         return {
-            'pet_type': (str,),  # noqa: E501
         }
 
     @cached_property
@@ -103,7 +102,6 @@ class ParentPet(ModelComposed):
         return {'pet_type': val}
 
     attribute_map = {
-        'pet_type': 'pet_type',  # noqa: E501
     }
 
     read_only_vars = {
@@ -115,7 +113,6 @@ class ParentPet(ModelComposed):
         """ParentPet - a model defined in OpenAPI
 
         Keyword Args:
-            pet_type (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
@@ -215,7 +212,6 @@ class ParentPet(ModelComposed):
         """ParentPet - a model defined in OpenAPI
 
         Keyword Args:
-            pet_type (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
diff --git a/samples/openapi3/client/petstore/python/petstore_api/model/pig.py b/samples/openapi3/client/petstore/python/petstore_api/model/pig.py
index 07845be55eb18148086fbf7a21fcf03282d3d9ea..e1ba079da624c6e27f93091265b73d6736afd8eb 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/model/pig.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/model/pig.py
@@ -89,7 +89,6 @@ class Pig(ModelComposed):
         """
         lazy_import()
         return {
-            'class_name': (str,),  # noqa: E501
         }
 
     @cached_property
@@ -104,7 +103,6 @@ class Pig(ModelComposed):
         return {'class_name': val}
 
     attribute_map = {
-        'class_name': 'className',  # noqa: E501
     }
 
     read_only_vars = {
@@ -116,7 +114,6 @@ class Pig(ModelComposed):
         """Pig - a model defined in OpenAPI
 
         Keyword Args:
-            class_name (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
@@ -216,7 +213,6 @@ class Pig(ModelComposed):
         """Pig - a model defined in OpenAPI
 
         Keyword Args:
-            class_name (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
diff --git a/samples/openapi3/client/petstore/python/petstore_api/model/quadrilateral.py b/samples/openapi3/client/petstore/python/petstore_api/model/quadrilateral.py
index b3aefcd1bd503ac54aa13d71cc8e1aa9c1b549a2..7eb18dea4d669f1d5aac5ee0d5a5f414eec35aea 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/model/quadrilateral.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/model/quadrilateral.py
@@ -89,8 +89,6 @@ class Quadrilateral(ModelComposed):
         """
         lazy_import()
         return {
-            'quadrilateral_type': (str,),  # noqa: E501
-            'shape_type': (str,),  # noqa: E501
         }
 
     @cached_property
@@ -105,8 +103,6 @@ class Quadrilateral(ModelComposed):
         return {'quadrilateral_type': val}
 
     attribute_map = {
-        'quadrilateral_type': 'quadrilateralType',  # noqa: E501
-        'shape_type': 'shapeType',  # noqa: E501
     }
 
     read_only_vars = {
@@ -118,7 +114,6 @@ class Quadrilateral(ModelComposed):
         """Quadrilateral - a model defined in OpenAPI
 
         Keyword Args:
-            quadrilateral_type (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
@@ -149,7 +144,6 @@ class Quadrilateral(ModelComposed):
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            shape_type (str): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
@@ -219,7 +213,6 @@ class Quadrilateral(ModelComposed):
         """Quadrilateral - a model defined in OpenAPI
 
         Keyword Args:
-            quadrilateral_type (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
@@ -250,7 +243,6 @@ class Quadrilateral(ModelComposed):
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            shape_type (str): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/model/scalene_triangle.py b/samples/openapi3/client/petstore/python/petstore_api/model/scalene_triangle.py
index a10ce28f172ba7d204d38583203cac272707249d..67ad0a4bef810b5c030d35978585794b94f33263 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/model/scalene_triangle.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/model/scalene_triangle.py
@@ -89,8 +89,6 @@ class ScaleneTriangle(ModelComposed):
         """
         lazy_import()
         return {
-            'shape_type': (str,),  # noqa: E501
-            'triangle_type': (str,),  # noqa: E501
         }
 
     @cached_property
@@ -99,8 +97,6 @@ class ScaleneTriangle(ModelComposed):
 
 
     attribute_map = {
-        'shape_type': 'shapeType',  # noqa: E501
-        'triangle_type': 'triangleType',  # noqa: E501
     }
 
     read_only_vars = {
@@ -112,8 +108,6 @@ class ScaleneTriangle(ModelComposed):
         """ScaleneTriangle - a model defined in OpenAPI
 
         Keyword Args:
-            shape_type (str):
-            triangle_type (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
@@ -213,8 +207,6 @@ class ScaleneTriangle(ModelComposed):
         """ScaleneTriangle - a model defined in OpenAPI
 
         Keyword Args:
-            shape_type (str):
-            triangle_type (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
diff --git a/samples/openapi3/client/petstore/python/petstore_api/model/shape.py b/samples/openapi3/client/petstore/python/petstore_api/model/shape.py
index 50e21b8c8d8b7f9bd78f4a5d1683682835228161..8577516dd2e77018bb60650f03fdb86eb3011317 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/model/shape.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/model/shape.py
@@ -89,9 +89,6 @@ class Shape(ModelComposed):
         """
         lazy_import()
         return {
-            'shape_type': (str,),  # noqa: E501
-            'quadrilateral_type': (str,),  # noqa: E501
-            'triangle_type': (str,),  # noqa: E501
         }
 
     @cached_property
@@ -106,9 +103,6 @@ class Shape(ModelComposed):
         return {'shape_type': val}
 
     attribute_map = {
-        'shape_type': 'shapeType',  # noqa: E501
-        'quadrilateral_type': 'quadrilateralType',  # noqa: E501
-        'triangle_type': 'triangleType',  # noqa: E501
     }
 
     read_only_vars = {
@@ -120,7 +114,6 @@ class Shape(ModelComposed):
         """Shape - a model defined in OpenAPI
 
         Keyword Args:
-            shape_type (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
@@ -151,8 +144,6 @@ class Shape(ModelComposed):
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            quadrilateral_type (str): [optional]  # noqa: E501
-            triangle_type (str): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
@@ -222,7 +213,6 @@ class Shape(ModelComposed):
         """Shape - a model defined in OpenAPI
 
         Keyword Args:
-            shape_type (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
@@ -253,8 +243,6 @@ class Shape(ModelComposed):
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            quadrilateral_type (str): [optional]  # noqa: E501
-            triangle_type (str): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/model/shape_or_null.py b/samples/openapi3/client/petstore/python/petstore_api/model/shape_or_null.py
index 00ae221f8a63ef910999c2a9998f0d5ba75ed55c..15b480de208d532fe8974f6679061a7b687a6f1e 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/model/shape_or_null.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/model/shape_or_null.py
@@ -89,9 +89,6 @@ class ShapeOrNull(ModelComposed):
         """
         lazy_import()
         return {
-            'shape_type': (str,),  # noqa: E501
-            'quadrilateral_type': (str,),  # noqa: E501
-            'triangle_type': (str,),  # noqa: E501
         }
 
     @cached_property
@@ -106,9 +103,6 @@ class ShapeOrNull(ModelComposed):
         return {'shape_type': val}
 
     attribute_map = {
-        'shape_type': 'shapeType',  # noqa: E501
-        'quadrilateral_type': 'quadrilateralType',  # noqa: E501
-        'triangle_type': 'triangleType',  # noqa: E501
     }
 
     read_only_vars = {
@@ -120,7 +114,6 @@ class ShapeOrNull(ModelComposed):
         """ShapeOrNull - a model defined in OpenAPI
 
         Keyword Args:
-            shape_type (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
@@ -151,8 +144,6 @@ class ShapeOrNull(ModelComposed):
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            quadrilateral_type (str): [optional]  # noqa: E501
-            triangle_type (str): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
@@ -222,7 +213,6 @@ class ShapeOrNull(ModelComposed):
         """ShapeOrNull - a model defined in OpenAPI
 
         Keyword Args:
-            shape_type (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
@@ -253,8 +243,6 @@ class ShapeOrNull(ModelComposed):
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            quadrilateral_type (str): [optional]  # noqa: E501
-            triangle_type (str): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/model/simple_quadrilateral.py b/samples/openapi3/client/petstore/python/petstore_api/model/simple_quadrilateral.py
index 1a3bef4c26e2e2e58b10727c1bd789001593db30..78ac41389252f1829c3125a7ef6d1ff62ea2b8f7 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/model/simple_quadrilateral.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/model/simple_quadrilateral.py
@@ -89,8 +89,6 @@ class SimpleQuadrilateral(ModelComposed):
         """
         lazy_import()
         return {
-            'shape_type': (str,),  # noqa: E501
-            'quadrilateral_type': (str,),  # noqa: E501
         }
 
     @cached_property
@@ -99,8 +97,6 @@ class SimpleQuadrilateral(ModelComposed):
 
 
     attribute_map = {
-        'shape_type': 'shapeType',  # noqa: E501
-        'quadrilateral_type': 'quadrilateralType',  # noqa: E501
     }
 
     read_only_vars = {
@@ -112,8 +108,6 @@ class SimpleQuadrilateral(ModelComposed):
         """SimpleQuadrilateral - a model defined in OpenAPI
 
         Keyword Args:
-            shape_type (str):
-            quadrilateral_type (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
@@ -213,8 +207,6 @@ class SimpleQuadrilateral(ModelComposed):
         """SimpleQuadrilateral - a model defined in OpenAPI
 
         Keyword Args:
-            shape_type (str):
-            quadrilateral_type (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
diff --git a/samples/openapi3/client/petstore/python/petstore_api/model/triangle.py b/samples/openapi3/client/petstore/python/petstore_api/model/triangle.py
index f9082e2098ff77697d35a316bf4c43716489cef0..9436b5011be4622ee6bdbee6a2f7d1b789d7d854 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/model/triangle.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/model/triangle.py
@@ -91,8 +91,6 @@ class Triangle(ModelComposed):
         """
         lazy_import()
         return {
-            'triangle_type': (str,),  # noqa: E501
-            'shape_type': (str,),  # noqa: E501
         }
 
     @cached_property
@@ -108,8 +106,6 @@ class Triangle(ModelComposed):
         return {'triangle_type': val}
 
     attribute_map = {
-        'triangle_type': 'triangleType',  # noqa: E501
-        'shape_type': 'shapeType',  # noqa: E501
     }
 
     read_only_vars = {
@@ -121,7 +117,6 @@ class Triangle(ModelComposed):
         """Triangle - a model defined in OpenAPI
 
         Keyword Args:
-            triangle_type (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
@@ -152,7 +147,6 @@ class Triangle(ModelComposed):
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            shape_type (str): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
@@ -222,7 +216,6 @@ class Triangle(ModelComposed):
         """Triangle - a model defined in OpenAPI
 
         Keyword Args:
-            triangle_type (str):
             _check_type (bool): if True, values for parameters in openapi_types
                                 will be type checked and a TypeError will be
                                 raised if the wrong type is input.
@@ -253,7 +246,6 @@ class Triangle(ModelComposed):
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            shape_type (str): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)