diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
index ba209679651..67bee20dbe0 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
@@ -426,7 +426,7 @@ public class DefaultGenerator implements Generator {
 
         Boolean skipFormModel = GlobalSettings.getProperty(CodegenConstants.SKIP_FORM_MODEL) != null ?
                 Boolean.valueOf(GlobalSettings.getProperty(CodegenConstants.SKIP_FORM_MODEL)) :
-                getGeneratorPropertyDefaultSwitch(CodegenConstants.SKIP_FORM_MODEL, false);
+                getGeneratorPropertyDefaultSwitch(CodegenConstants.SKIP_FORM_MODEL, true);
 
         // process models only
         for (String name : modelKeys) {
@@ -448,9 +448,9 @@ public class DefaultGenerator implements Generator {
                 if (unusedModels.contains(name)) {
                     if (Boolean.FALSE.equals(skipFormModel)) {
                         // if skipFormModel sets to true, still generate the model and log the result
-                        LOGGER.info("Model {} (marked as unused due to form parameters) is generated due to the system property skipFormModel=false (default)", name);
+                        LOGGER.info("Model {} (marked as unused due to form parameters) is generated due to the global property `skipFormModel` set to false", name);
                     } else {
-                        LOGGER.info("Model {} not generated since it's marked as unused (due to form parameters) and skipFormModel (system property) set to true", name);
+                        LOGGER.info("Model {} not generated since it's marked as unused (due to form parameters) and `skipFormModel` (global property) set to true (default)", name);
                         // TODO: Should this be added to dryRun? If not, this seems like a weird place to return early from processing.
                         continue;
                     }
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 cc73cd31189..2a84a4fb6cd 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
@@ -92,7 +92,7 @@ public class PythonClientCodegen extends PythonLegacyClientCodegen {
                 .excludeParameterFeatures(
                         ParameterFeature.Cookie
                 )
-         );
+        );
 
         // this may set datatype right for additional properties
         instantiationTypes.put("map", "dict");
@@ -130,7 +130,7 @@ public class PythonClientCodegen extends PythonLegacyClientCodegen {
         supportingFiles.add(new SupportingFile("__init__apis.mustache", packagePath() + File.separatorChar + "apis", "__init__.py"));
         // Generate the 'signing.py' module, but only if the 'HTTP signature' security scheme is specified in the OAS.
         Map<String, SecurityScheme> securitySchemeMap = openAPI != null ?
-           (openAPI.getComponents() != null ? openAPI.getComponents().getSecuritySchemes() : null) : null;
+                (openAPI.getComponents() != null ? openAPI.getComponents().getSecuritySchemes() : null) : null;
         List<CodegenSecurity> authMethods = fromSecurity(securitySchemeMap);
         if (ProcessUtils.hasHttpSignatureMethods(authMethods)) {
             supportingFiles.add(new SupportingFile("signing.mustache", packagePath(), "signing.py"));
@@ -302,7 +302,7 @@ public class PythonClientCodegen extends PythonLegacyClientCodegen {
         } else if (ModelUtils.isDateTimeSchema(p)) {
             defaultValue = pythonDateTime(defaultObject);
         } else if (ModelUtils.isStringSchema(p) && !ModelUtils.isByteArraySchema(p) && !ModelUtils.isBinarySchema(p) && !ModelUtils.isFileSchema(p) && !ModelUtils.isUUIDSchema(p) && !ModelUtils.isEmailSchema(p)) {
-            defaultValue =  ensureQuotes(defaultValue);
+            defaultValue = ensureQuotes(defaultValue);
         } else if (ModelUtils.isBooleanSchema(p)) {
             if (Boolean.valueOf(defaultValue) == false) {
                 defaultValue = "False";
@@ -316,7 +316,7 @@ public class PythonClientCodegen extends PythonLegacyClientCodegen {
     @Override
     public String toModelImport(String name) {
         // name looks like Cat
-        return "from " + modelPackage() + "." + toModelFilename(name) + " import "+ toModelName(name);
+        return "from " + modelPackage() + "." + toModelFilename(name) + " import " + toModelName(name);
     }
 
     @Override
@@ -326,9 +326,9 @@ public class PythonClientCodegen extends PythonLegacyClientCodegen {
         // loops through imports and converts them all
         // from 'Pet' to 'from petstore_api.model.pet import Pet'
 
-        HashMap<String, Object> val = (HashMap<String, Object>)objs.get("operations");
+        HashMap<String, Object> val = (HashMap<String, Object>) objs.get("operations");
         ArrayList<CodegenOperation> operations = (ArrayList<CodegenOperation>) val.get("operation");
-        ArrayList<HashMap<String, String>> imports = (ArrayList<HashMap<String, String>>)objs.get("imports");
+        ArrayList<HashMap<String, String>> imports = (ArrayList<HashMap<String, String>>) objs.get("imports");
         for (CodegenOperation operation : operations) {
             if (operation.imports.size() == 0) {
                 continue;
@@ -356,27 +356,29 @@ public class PythonClientCodegen extends PythonLegacyClientCodegen {
      */
     @Override
     public Map<String, Object> postProcessAllModels(Map<String, Object> objs) {
-         super.postProcessAllModels(objs);
+        super.postProcessAllModels(objs);
 
         List<String> modelsToRemove = new ArrayList<>();
         Map<String, Schema> allDefinitions = ModelUtils.getSchemas(this.openAPI);
-        for (String schemaName: allDefinitions.keySet()) {
-            Schema refSchema = new Schema().$ref("#/components/schemas/"+schemaName);
+        for (String schemaName : allDefinitions.keySet()) {
+            Schema refSchema = new Schema().$ref("#/components/schemas/" + schemaName);
             Schema unaliasedSchema = unaliasSchema(refSchema, importMapping);
             String modelName = toModelName(schemaName);
             if (unaliasedSchema.get$ref() == null) {
                 modelsToRemove.add(modelName);
             } else {
                 HashMap<String, Object> objModel = (HashMap<String, Object>) objs.get(modelName);
-                List<Map<String, Object>> models = (List<Map<String, Object>>) objModel.get("models");
-                for (Map<String, Object> model : models) {
-                    CodegenModel cm = (CodegenModel) model.get("model");
-                    String[] importModelNames = cm.imports.toArray(new String[0]);
-                    cm.imports.clear();
-                    for (String importModelName : importModelNames) {
-                        cm.imports.add(toModelImport(importModelName));
-                        String globalImportFixer = "globals()['" + importModelName + "'] = " + importModelName;
-                        cm.imports.add(globalImportFixer);
+                if (objModel != null) { // to avoid form parameter's models that are not generated (skipFormModel=true)
+                    List<Map<String, Object>> models = (List<Map<String, Object>>) objModel.get("models");
+                    for (Map<String, Object> model : models) {
+                        CodegenModel cm = (CodegenModel) model.get("model");
+                        String[] importModelNames = cm.imports.toArray(new String[0]);
+                        cm.imports.clear();
+                        for (String importModelName : importModelNames) {
+                            cm.imports.add(toModelImport(importModelName));
+                            String globalImportFixer = "globals()['" + importModelName + "'] = " + importModelName;
+                            cm.imports.add(globalImportFixer);
+                        }
                     }
                 }
             }
@@ -511,13 +513,13 @@ public class PythonClientCodegen extends PythonLegacyClientCodegen {
     }
 
 
-        /**
-         * Return the sanitized variable name for enum
-         *
-         * @param value    enum variable name
-         * @param datatype data type
-         * @return the sanitized variable name for enum
-         */
+    /**
+     * Return the sanitized variable name for enum
+     *
+     * @param value    enum variable name
+     * @param datatype data type
+     * @return the sanitized variable name for enum
+     */
     public String toEnumVarName(String value, String datatype) {
         // our enum var names are keys in a python dict, so change spaces to underscores
         if (value.length() == 0) {
@@ -557,13 +559,13 @@ public class PythonClientCodegen extends PythonLegacyClientCodegen {
     @Override
     public void postProcessParameter(CodegenParameter p) {
         postProcessPattern(p.pattern, p.vendorExtensions);
-        if (p.baseType != null && languageSpecificPrimitives.contains(p.baseType)){
+        if (p.baseType != null && languageSpecificPrimitives.contains(p.baseType)) {
             // set baseType to null so the api docs will not point to a model for languageSpecificPrimitives
             p.baseType = null;
         }
     }
 
-    private void addNullDefaultToOneOfAnyOfReqProps(Schema schema, CodegenModel result){
+    private void addNullDefaultToOneOfAnyOfReqProps(Schema schema, CodegenModel result) {
         // for composed schema models, if the required properties are only from oneOf or anyOf models
         // give them a nulltype.Null so the user can omit including them in python
         ComposedSchema cs = (ComposedSchema) schema;
@@ -585,7 +587,7 @@ public class PythonClientCodegen extends PythonLegacyClientCodegen {
         if (anyOf != null) {
             oneOfanyOfSchemas.addAll(anyOf);
         }
-        for (Schema sc: oneOfanyOfSchemas) {
+        for (Schema sc : oneOfanyOfSchemas) {
             Schema refSchema = ModelUtils.getReferencedSchema(this.openAPI, sc);
             addProperties(otherProperties, otherRequired, refSchema);
         }
@@ -603,7 +605,7 @@ public class PythonClientCodegen extends PythonLegacyClientCodegen {
 
         List<CodegenProperty> reqVars = result.getRequiredVars();
         if (reqVars != null) {
-            for (CodegenProperty cp: reqVars) {
+            for (CodegenProperty cp : reqVars) {
                 String propName = cp.baseName;
                 if (otherRequiredSet.contains(propName) && !selfRequiredSet.contains(propName)) {
                     // if var is in otherRequiredSet and is not in selfRequiredSet and is in result.requiredVars
@@ -617,7 +619,7 @@ public class PythonClientCodegen extends PythonLegacyClientCodegen {
     /**
      * Sets the value of the 'model.parent' property in CodegenModel
      * We have a custom version of this function so we can add the dataType on the ArrayModel
-    */
+     */
     @Override
     protected void addParentContainer(CodegenModel model, String name, Schema schema) {
         super.addParentContainer(model, name, schema);
@@ -632,8 +634,8 @@ public class PythonClientCodegen extends PythonLegacyClientCodegen {
      * - set the correct regex values for requiredVars + optionalVars
      * - set model.defaultValue and model.hasRequired per the three use cases defined in this method
      *
-     * @param name   the name of the model
-     * @param sc OAS Model object
+     * @param name the name of the model
+     * @param sc   OAS Model object
      * @return Codegen Model object
      */
     @Override
@@ -714,20 +716,20 @@ public class PythonClientCodegen extends PythonLegacyClientCodegen {
      * Primitive types in the OAS specification are implemented in Python using the corresponding
      * Python primitive types.
      * Composed types (e.g. allAll, oneOf, anyOf) are represented in Python using list of types.
-     *
+     * <p>
      * The caller should set the prefix and suffix arguments to empty string, except when
      * getTypeString invokes itself recursively. A non-empty prefix/suffix may be specified
      * to wrap the return value in a python dict, list or tuple.
-     *
+     * <p>
      * Examples:
      * - "bool, date, float"  The data must be a bool, date or float.
      * - "[bool, date]"       The data must be an array, and the array items must be a bool or date.
      *
-     * @param p The OAS schema.
-     * @param prefix prepended to the returned value.
-     * @param suffix appended to the returned value.
+     * @param p                    The OAS schema.
+     * @param prefix               prepended to the returned value.
+     * @param suffix               appended to the returned value.
      * @param referencedModelNames a list of models that are being referenced while generating the types,
-     *          may be used to generate imports.
+     *                             may be used to generate imports.
      * @return a comma-separated string representation of the Python types
      */
     private String getTypeString(Schema p, String prefix, String suffix, List<String> referencedModelNames) {
@@ -846,7 +848,8 @@ public class PythonClientCodegen extends PythonLegacyClientCodegen {
         }
         if (schema.getExample() != null) {
             return schema.getExample();
-        } if (schema.getDefault() != null) {
+        }
+        if (schema.getDefault() != null) {
             return schema.getDefault();
         } else if (schema.getEnum() != null && !schema.getEnum().isEmpty()) {
             return schema.getEnum().get(0);
@@ -892,7 +895,7 @@ public class PythonClientCodegen extends PythonLegacyClientCodegen {
     }
 
     private MappedModel getDiscriminatorMappedModel(CodegenDiscriminator disc) {
-        for ( MappedModel mm : disc.getMappedModels() ) {
+        for (MappedModel mm : disc.getMappedModels()) {
             String modelName = mm.getModelName();
             Schema modelSchema = getModelNameToSchemaCache().get(modelName);
             if (ModelUtils.isObjectSchema(modelSchema)) {
@@ -928,7 +931,7 @@ public class PythonClientCodegen extends PythonLegacyClientCodegen {
         final String indentionConst = "    ";
         String currentIndentation = "";
         String closingIndentation = "";
-        for (int i=0 ; i < indentationLevel ; i++) currentIndentation += indentionConst;
+        for (int i = 0; i < indentationLevel; i++) currentIndentation += indentionConst;
         if (exampleLine.equals(0)) {
             closingIndentation = currentIndentation;
             currentIndentation = "";
@@ -938,7 +941,7 @@ public class PythonClientCodegen extends PythonLegacyClientCodegen {
         String openChars = "";
         String closeChars = "";
         if (modelName != null) {
-            openChars = modelName+"(";
+            openChars = modelName + "(";
             closeChars = ")";
         }
 
@@ -953,7 +956,7 @@ public class PythonClientCodegen extends PythonLegacyClientCodegen {
             String ref = ModelUtils.getSimpleRef(schema.get$ref());
             Schema refSchema = allDefinitions.get(ref);
             if (null == refSchema) {
-                LOGGER.warn("Unable to find referenced schema "+schema.get$ref()+"\n");
+                LOGGER.warn("Unable to find referenced schema " + schema.get$ref() + "\n");
                 return fullPrefix + "None" + closeChars;
             }
             String refModelName = getModelName(schema);
@@ -1003,7 +1006,7 @@ public class PythonClientCodegen extends PythonLegacyClientCodegen {
                 // a BigDecimal:
                 if ("Number".equalsIgnoreCase(schema.getFormat())) {
                     example = "2";
-                    return  fullPrefix + example + closeChars;
+                    return fullPrefix + example + closeChars;
                 } else if (StringUtils.isNotBlank(schema.getPattern())) {
                     String pattern = schema.getPattern();
                     RgxGen rgxGen = new RgxGen(pattern);
@@ -1021,14 +1024,14 @@ public class PythonClientCodegen extends PythonLegacyClientCodegen {
                 } else if (schema.getMinLength() != null) {
                     example = "";
                     int len = schema.getMinLength().intValue();
-                    for (int i=0;i<len;i++) example += "a";
+                    for (int i = 0; i < len; i++) example += "a";
                 } else if (ModelUtils.isUUIDSchema(schema)) {
                     example = "046b6c7f-0b8a-43b9-b35d-6489e6daee91";
                 } else {
                     example = "string_example";
                 }
             }
-            return  fullPrefix + ensureQuotes(example) + closeChars;
+            return fullPrefix + ensureQuotes(example) + closeChars;
         } else if (ModelUtils.isIntegerSchema(schema)) {
             if (objExample == null) {
                 if (schema.getMinimum() != null) {
@@ -1055,7 +1058,7 @@ public class PythonClientCodegen extends PythonLegacyClientCodegen {
             ArraySchema arrayschema = (ArraySchema) schema;
             Schema itemSchema = arrayschema.getItems();
             String itemModelName = getModelName(itemSchema);
-            example = fullPrefix + "[" + "\n" + toExampleValueRecursive(itemModelName, itemSchema, objExample, indentationLevel+1, "", exampleLine+1) + ",\n" + closingIndentation + "]" + closeChars;
+            example = fullPrefix + "[" + "\n" + toExampleValueRecursive(itemModelName, itemSchema, objExample, indentationLevel + 1, "", exampleLine + 1) + ",\n" + closingIndentation + "]" + closeChars;
             return example;
         } else if (ModelUtils.isMapSchema(schema)) {
             if (modelName == null) {
@@ -1074,10 +1077,10 @@ public class PythonClientCodegen extends PythonLegacyClientCodegen {
                 addPropsExample = exampleFromStringOrArraySchema(addPropsSchema, addPropsExample, key);
                 String addPropPrefix = key + "=";
                 if (modelName == null) {
-                        addPropPrefix = ensureQuotes(key) + ": ";
+                    addPropPrefix = ensureQuotes(key) + ": ";
                 }
                 String addPropsModelName = getModelName(addPropsSchema);
-                example = fullPrefix + "\n" +  toExampleValueRecursive(addPropsModelName, addPropsSchema, addPropsExample, indentationLevel + 1, addPropPrefix, exampleLine + 1) + ",\n" + closingIndentation + closeChars;
+                example = fullPrefix + "\n" + toExampleValueRecursive(addPropsModelName, addPropsSchema, addPropsExample, indentationLevel + 1, addPropPrefix, exampleLine + 1) + ",\n" + closingIndentation + closeChars;
             } else {
                 example = fullPrefix + closeChars;
             }
@@ -1172,7 +1175,7 @@ public class PythonClientCodegen extends PythonLegacyClientCodegen {
             ArraySchema arraySchema = (ArraySchema) schema;
             Schema itemSchema = arraySchema.getItems();
             example = getObjectExample(itemSchema);
-            if (example != null ) {
+            if (example != null) {
                 return example;
             } else if (simpleStringSchema(itemSchema)) {
                 return propName + "_example";
@@ -1259,9 +1262,9 @@ public class PythonClientCodegen extends PythonLegacyClientCodegen {
      * This ensures that all of our samples are generated in
      * toExampleValueRecursive
      *
-     * @param name the property name
+     * @param name           the property name
      * @param propertySchema the property schema
-     * @param imports our import set
+     * @param imports        our import set
      * @return the resultant CodegenParameter
      */
     @Override
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultGeneratorTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultGeneratorTest.java
index 8ac2fe4a512..ad9f062ee56 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultGeneratorTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultGeneratorTest.java
@@ -64,7 +64,7 @@ public class DefaultGeneratorTest {
 
             List<File> files = generator.opts(clientOptInput).generate();
 
-            Assert.assertEquals(files.size(), 44);
+            Assert.assertEquals(files.size(), 42);
 
             // Check expected generated files
             // api sanity check
@@ -149,7 +149,7 @@ public class DefaultGeneratorTest {
 
             List<File> files = generator.opts(clientOptInput).generate();
 
-            Assert.assertEquals(files.size(), 20);
+            Assert.assertEquals(files.size(), 16);
 
             // Check API is written and Test is not
             TestUtils.ensureContainsFile(files, output, "src/main/java/org/openapitools/client/api/PetApi.java");
diff --git a/samples/client/petstore/apex/.openapi-generator/FILES b/samples/client/petstore/apex/.openapi-generator/FILES
index dd1183e235a..11fd3bc07bb 100644
--- a/samples/client/petstore/apex/.openapi-generator/FILES
+++ b/samples/client/petstore/apex/.openapi-generator/FILES
@@ -8,10 +8,6 @@ force-app/main/default/classes/OASCategory.cls
 force-app/main/default/classes/OASCategory.cls-meta.xml
 force-app/main/default/classes/OASClient.cls
 force-app/main/default/classes/OASClient.cls-meta.xml
-force-app/main/default/classes/OASInlineObject.cls
-force-app/main/default/classes/OASInlineObject.cls-meta.xml
-force-app/main/default/classes/OASInlineObject1.cls
-force-app/main/default/classes/OASInlineObject1.cls-meta.xml
 force-app/main/default/classes/OASOrder.cls
 force-app/main/default/classes/OASOrder.cls-meta.xml
 force-app/main/default/classes/OASPet.cls
diff --git a/samples/client/petstore/apex/README.md b/samples/client/petstore/apex/README.md
index 3a22819780c..60da087e3fb 100644
--- a/samples/client/petstore/apex/README.md
+++ b/samples/client/petstore/apex/README.md
@@ -91,8 +91,6 @@ Class | Method | HTTP request | Description
 
  - [OASApiResponse](OASApiResponse.md)
  - [OASCategory](OASCategory.md)
- - [OASInlineObject](OASInlineObject.md)
- - [OASInlineObject1](OASInlineObject1.md)
  - [OASOrder](OASOrder.md)
  - [OASPet](OASPet.md)
  - [OASTag](OASTag.md)
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/FILES
index aef29569f0f..d258eb64b2f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/FILES
@@ -43,12 +43,6 @@ docs/GmFruit.md
 docs/GrandparentAnimal.md
 docs/HasOnlyReadOnly.md
 docs/HealthCheckResult.md
-docs/InlineObject.md
-docs/InlineObject1.md
-docs/InlineObject2.md
-docs/InlineObject3.md
-docs/InlineObject4.md
-docs/InlineObject5.md
 docs/InlineResponseDefault.md
 docs/IsoscelesTriangle.md
 docs/List.md
@@ -153,12 +147,6 @@ src/Org.OpenAPITools/Model/GmFruit.cs
 src/Org.OpenAPITools/Model/GrandparentAnimal.cs
 src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs
 src/Org.OpenAPITools/Model/HealthCheckResult.cs
-src/Org.OpenAPITools/Model/InlineObject.cs
-src/Org.OpenAPITools/Model/InlineObject1.cs
-src/Org.OpenAPITools/Model/InlineObject2.cs
-src/Org.OpenAPITools/Model/InlineObject3.cs
-src/Org.OpenAPITools/Model/InlineObject4.cs
-src/Org.OpenAPITools/Model/InlineObject5.cs
 src/Org.OpenAPITools/Model/InlineResponseDefault.cs
 src/Org.OpenAPITools/Model/IsoscelesTriangle.cs
 src/Org.OpenAPITools/Model/List.cs
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/README.md
index 82ce25e0091..cd422fe287d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/README.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/README.md
@@ -195,12 +195,6 @@ Class | Method | HTTP request | Description
  - [Model.GrandparentAnimal](docs/GrandparentAnimal.md)
  - [Model.HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [Model.HealthCheckResult](docs/HealthCheckResult.md)
- - [Model.InlineObject](docs/InlineObject.md)
- - [Model.InlineObject1](docs/InlineObject1.md)
- - [Model.InlineObject2](docs/InlineObject2.md)
- - [Model.InlineObject3](docs/InlineObject3.md)
- - [Model.InlineObject4](docs/InlineObject4.md)
- - [Model.InlineObject5](docs/InlineObject5.md)
  - [Model.InlineResponseDefault](docs/InlineResponseDefault.md)
  - [Model.IsoscelesTriangle](docs/IsoscelesTriangle.md)
  - [Model.List](docs/List.md)
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES
index 64a8f8f9d06..37763cd49bc 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES
@@ -43,12 +43,6 @@ docs/GmFruit.md
 docs/GrandparentAnimal.md
 docs/HasOnlyReadOnly.md
 docs/HealthCheckResult.md
-docs/InlineObject.md
-docs/InlineObject1.md
-docs/InlineObject2.md
-docs/InlineObject3.md
-docs/InlineObject4.md
-docs/InlineObject5.md
 docs/InlineResponseDefault.md
 docs/IsoscelesTriangle.md
 docs/List.md
@@ -152,12 +146,6 @@ src/Org.OpenAPITools/Model/GmFruit.cs
 src/Org.OpenAPITools/Model/GrandparentAnimal.cs
 src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs
 src/Org.OpenAPITools/Model/HealthCheckResult.cs
-src/Org.OpenAPITools/Model/InlineObject.cs
-src/Org.OpenAPITools/Model/InlineObject1.cs
-src/Org.OpenAPITools/Model/InlineObject2.cs
-src/Org.OpenAPITools/Model/InlineObject3.cs
-src/Org.OpenAPITools/Model/InlineObject4.cs
-src/Org.OpenAPITools/Model/InlineObject5.cs
 src/Org.OpenAPITools/Model/InlineResponseDefault.cs
 src/Org.OpenAPITools/Model/IsoscelesTriangle.cs
 src/Org.OpenAPITools/Model/List.cs
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/README.md
index 98da1830fc3..1cca61e2871 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/README.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/README.md
@@ -183,12 +183,6 @@ Class | Method | HTTP request | Description
  - [Model.GrandparentAnimal](docs/GrandparentAnimal.md)
  - [Model.HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [Model.HealthCheckResult](docs/HealthCheckResult.md)
- - [Model.InlineObject](docs/InlineObject.md)
- - [Model.InlineObject1](docs/InlineObject1.md)
- - [Model.InlineObject2](docs/InlineObject2.md)
- - [Model.InlineObject3](docs/InlineObject3.md)
- - [Model.InlineObject4](docs/InlineObject4.md)
- - [Model.InlineObject5](docs/InlineObject5.md)
  - [Model.InlineResponseDefault](docs/InlineResponseDefault.md)
  - [Model.IsoscelesTriangle](docs/IsoscelesTriangle.md)
  - [Model.List](docs/List.md)
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES
index 64a8f8f9d06..37763cd49bc 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES
@@ -43,12 +43,6 @@ docs/GmFruit.md
 docs/GrandparentAnimal.md
 docs/HasOnlyReadOnly.md
 docs/HealthCheckResult.md
-docs/InlineObject.md
-docs/InlineObject1.md
-docs/InlineObject2.md
-docs/InlineObject3.md
-docs/InlineObject4.md
-docs/InlineObject5.md
 docs/InlineResponseDefault.md
 docs/IsoscelesTriangle.md
 docs/List.md
@@ -152,12 +146,6 @@ src/Org.OpenAPITools/Model/GmFruit.cs
 src/Org.OpenAPITools/Model/GrandparentAnimal.cs
 src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs
 src/Org.OpenAPITools/Model/HealthCheckResult.cs
-src/Org.OpenAPITools/Model/InlineObject.cs
-src/Org.OpenAPITools/Model/InlineObject1.cs
-src/Org.OpenAPITools/Model/InlineObject2.cs
-src/Org.OpenAPITools/Model/InlineObject3.cs
-src/Org.OpenAPITools/Model/InlineObject4.cs
-src/Org.OpenAPITools/Model/InlineObject5.cs
 src/Org.OpenAPITools/Model/InlineResponseDefault.cs
 src/Org.OpenAPITools/Model/IsoscelesTriangle.cs
 src/Org.OpenAPITools/Model/List.cs
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md
index 82ce25e0091..cd422fe287d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md
@@ -195,12 +195,6 @@ Class | Method | HTTP request | Description
  - [Model.GrandparentAnimal](docs/GrandparentAnimal.md)
  - [Model.HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [Model.HealthCheckResult](docs/HealthCheckResult.md)
- - [Model.InlineObject](docs/InlineObject.md)
- - [Model.InlineObject1](docs/InlineObject1.md)
- - [Model.InlineObject2](docs/InlineObject2.md)
- - [Model.InlineObject3](docs/InlineObject3.md)
- - [Model.InlineObject4](docs/InlineObject4.md)
- - [Model.InlineObject5](docs/InlineObject5.md)
  - [Model.InlineResponseDefault](docs/InlineResponseDefault.md)
  - [Model.IsoscelesTriangle](docs/IsoscelesTriangle.md)
  - [Model.List](docs/List.md)
diff --git a/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/FILES b/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/FILES
index 7c46a2e22da..84bc4947446 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/FILES
@@ -30,12 +30,6 @@ docs/Foo.md
 docs/FormatTest.md
 docs/HasOnlyReadOnly.md
 docs/HealthCheckResult.md
-docs/InlineObject.md
-docs/InlineObject1.md
-docs/InlineObject2.md
-docs/InlineObject3.md
-docs/InlineObject4.md
-docs/InlineObject5.md
 docs/InlineResponseDefault.md
 docs/List.md
 docs/MapTest.md
@@ -101,12 +95,6 @@ src/Org.OpenAPITools/Model/Foo.cs
 src/Org.OpenAPITools/Model/FormatTest.cs
 src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs
 src/Org.OpenAPITools/Model/HealthCheckResult.cs
-src/Org.OpenAPITools/Model/InlineObject.cs
-src/Org.OpenAPITools/Model/InlineObject1.cs
-src/Org.OpenAPITools/Model/InlineObject2.cs
-src/Org.OpenAPITools/Model/InlineObject3.cs
-src/Org.OpenAPITools/Model/InlineObject4.cs
-src/Org.OpenAPITools/Model/InlineObject5.cs
 src/Org.OpenAPITools/Model/InlineResponseDefault.cs
 src/Org.OpenAPITools/Model/List.cs
 src/Org.OpenAPITools/Model/MapTest.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient/README.md b/samples/client/petstore/csharp/OpenAPIClient/README.md
index 4b200ade794..b99f1f79d97 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/README.md
+++ b/samples/client/petstore/csharp/OpenAPIClient/README.md
@@ -170,12 +170,6 @@ Class | Method | HTTP request | Description
  - [Model.FormatTest](docs/FormatTest.md)
  - [Model.HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [Model.HealthCheckResult](docs/HealthCheckResult.md)
- - [Model.InlineObject](docs/InlineObject.md)
- - [Model.InlineObject1](docs/InlineObject1.md)
- - [Model.InlineObject2](docs/InlineObject2.md)
- - [Model.InlineObject3](docs/InlineObject3.md)
- - [Model.InlineObject4](docs/InlineObject4.md)
- - [Model.InlineObject5](docs/InlineObject5.md)
  - [Model.InlineResponseDefault](docs/InlineResponseDefault.md)
  - [Model.List](docs/List.md)
  - [Model.MapTest](docs/MapTest.md)
diff --git a/samples/client/petstore/groovy/.openapi-generator/FILES b/samples/client/petstore/groovy/.openapi-generator/FILES
index 104b970e705..ff131f31507 100644
--- a/samples/client/petstore/groovy/.openapi-generator/FILES
+++ b/samples/client/petstore/groovy/.openapi-generator/FILES
@@ -5,8 +5,6 @@ src/main/groovy/org/openapitools/api/PetApi.groovy
 src/main/groovy/org/openapitools/api/StoreApi.groovy
 src/main/groovy/org/openapitools/api/UserApi.groovy
 src/main/groovy/org/openapitools/model/Category.groovy
-src/main/groovy/org/openapitools/model/InlineObject.groovy
-src/main/groovy/org/openapitools/model/InlineObject1.groovy
 src/main/groovy/org/openapitools/model/ModelApiResponse.groovy
 src/main/groovy/org/openapitools/model/Order.groovy
 src/main/groovy/org/openapitools/model/Pet.groovy
diff --git a/samples/client/petstore/javascript-es6/.openapi-generator/FILES b/samples/client/petstore/javascript-es6/.openapi-generator/FILES
index 79706e91539..85edf0d1717 100644
--- a/samples/client/petstore/javascript-es6/.openapi-generator/FILES
+++ b/samples/client/petstore/javascript-es6/.openapi-generator/FILES
@@ -29,12 +29,6 @@ docs/Foo.md
 docs/FormatTest.md
 docs/HasOnlyReadOnly.md
 docs/HealthCheckResult.md
-docs/InlineObject.md
-docs/InlineObject1.md
-docs/InlineObject2.md
-docs/InlineObject3.md
-docs/InlineObject4.md
-docs/InlineObject5.md
 docs/InlineResponseDefault.md
 docs/List.md
 docs/MapTest.md
@@ -93,12 +87,6 @@ src/model/Foo.js
 src/model/FormatTest.js
 src/model/HasOnlyReadOnly.js
 src/model/HealthCheckResult.js
-src/model/InlineObject.js
-src/model/InlineObject1.js
-src/model/InlineObject2.js
-src/model/InlineObject3.js
-src/model/InlineObject4.js
-src/model/InlineObject5.js
 src/model/InlineResponseDefault.js
 src/model/List.js
 src/model/MapTest.js
diff --git a/samples/client/petstore/javascript-es6/README.md b/samples/client/petstore/javascript-es6/README.md
index 08b186d8e0c..3855805f70f 100644
--- a/samples/client/petstore/javascript-es6/README.md
+++ b/samples/client/petstore/javascript-es6/README.md
@@ -186,12 +186,6 @@ Class | Method | HTTP request | Description
  - [OpenApiPetstore.FormatTest](docs/FormatTest.md)
  - [OpenApiPetstore.HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [OpenApiPetstore.HealthCheckResult](docs/HealthCheckResult.md)
- - [OpenApiPetstore.InlineObject](docs/InlineObject.md)
- - [OpenApiPetstore.InlineObject1](docs/InlineObject1.md)
- - [OpenApiPetstore.InlineObject2](docs/InlineObject2.md)
- - [OpenApiPetstore.InlineObject3](docs/InlineObject3.md)
- - [OpenApiPetstore.InlineObject4](docs/InlineObject4.md)
- - [OpenApiPetstore.InlineObject5](docs/InlineObject5.md)
  - [OpenApiPetstore.InlineResponseDefault](docs/InlineResponseDefault.md)
  - [OpenApiPetstore.List](docs/List.md)
  - [OpenApiPetstore.MapTest](docs/MapTest.md)
diff --git a/samples/client/petstore/javascript-es6/src/index.js b/samples/client/petstore/javascript-es6/src/index.js
index 1a0cda3b1dc..33321542c64 100644
--- a/samples/client/petstore/javascript-es6/src/index.js
+++ b/samples/client/petstore/javascript-es6/src/index.js
@@ -36,12 +36,6 @@ import Foo from './model/Foo';
 import FormatTest from './model/FormatTest';
 import HasOnlyReadOnly from './model/HasOnlyReadOnly';
 import HealthCheckResult from './model/HealthCheckResult';
-import InlineObject from './model/InlineObject';
-import InlineObject1 from './model/InlineObject1';
-import InlineObject2 from './model/InlineObject2';
-import InlineObject3 from './model/InlineObject3';
-import InlineObject4 from './model/InlineObject4';
-import InlineObject5 from './model/InlineObject5';
 import InlineResponseDefault from './model/InlineResponseDefault';
 import List from './model/List';
 import MapTest from './model/MapTest';
@@ -247,42 +241,6 @@ export {
      */
     HealthCheckResult,
 
-    /**
-     * The InlineObject model constructor.
-     * @property {module:model/InlineObject}
-     */
-    InlineObject,
-
-    /**
-     * The InlineObject1 model constructor.
-     * @property {module:model/InlineObject1}
-     */
-    InlineObject1,
-
-    /**
-     * The InlineObject2 model constructor.
-     * @property {module:model/InlineObject2}
-     */
-    InlineObject2,
-
-    /**
-     * The InlineObject3 model constructor.
-     * @property {module:model/InlineObject3}
-     */
-    InlineObject3,
-
-    /**
-     * The InlineObject4 model constructor.
-     * @property {module:model/InlineObject4}
-     */
-    InlineObject4,
-
-    /**
-     * The InlineObject5 model constructor.
-     * @property {module:model/InlineObject5}
-     */
-    InlineObject5,
-
     /**
      * The InlineResponseDefault model constructor.
      * @property {module:model/InlineResponseDefault}
diff --git a/samples/client/petstore/javascript-es6/test/model/InlineObject.spec.js b/samples/client/petstore/javascript-es6/test/model/InlineObject.spec.js
deleted file mode 100644
index 2f3c1707a2b..00000000000
--- a/samples/client/petstore/javascript-es6/test/model/InlineObject.spec.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- *
- */
-
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD.
-    define(['expect.js', '../../src/index'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    factory(require('expect.js'), require('../../src/index'));
-  } else {
-    // Browser globals (root is window)
-    factory(root.expect, root.OpenApiPetstore);
-  }
-}(this, function(expect, OpenApiPetstore) {
-  'use strict';
-
-  var instance;
-
-  beforeEach(function() {
-    instance = new OpenApiPetstore.InlineObject();
-  });
-
-  var getProperty = function(object, getter, property) {
-    // Use getter method if present; otherwise, get the property directly.
-    if (typeof object[getter] === 'function')
-      return object[getter]();
-    else
-      return object[property];
-  }
-
-  var setProperty = function(object, setter, property, value) {
-    // Use setter method if present; otherwise, set the property directly.
-    if (typeof object[setter] === 'function')
-      object[setter](value);
-    else
-      object[property] = value;
-  }
-
-  describe('InlineObject', function() {
-    it('should create an instance of InlineObject', function() {
-      // uncomment below and update the code to test InlineObject
-      //var instane = new OpenApiPetstore.InlineObject();
-      //expect(instance).to.be.a(OpenApiPetstore.InlineObject);
-    });
-
-    it('should have the property name (base name: "name")', function() {
-      // uncomment below and update the code to test the property name
-      //var instane = new OpenApiPetstore.InlineObject();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property status (base name: "status")', function() {
-      // uncomment below and update the code to test the property status
-      //var instane = new OpenApiPetstore.InlineObject();
-      //expect(instance).to.be();
-    });
-
-  });
-
-}));
diff --git a/samples/client/petstore/javascript-es6/test/model/InlineObject1.spec.js b/samples/client/petstore/javascript-es6/test/model/InlineObject1.spec.js
deleted file mode 100644
index b83a0204f8f..00000000000
--- a/samples/client/petstore/javascript-es6/test/model/InlineObject1.spec.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- *
- */
-
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD.
-    define(['expect.js', '../../src/index'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    factory(require('expect.js'), require('../../src/index'));
-  } else {
-    // Browser globals (root is window)
-    factory(root.expect, root.OpenApiPetstore);
-  }
-}(this, function(expect, OpenApiPetstore) {
-  'use strict';
-
-  var instance;
-
-  beforeEach(function() {
-    instance = new OpenApiPetstore.InlineObject1();
-  });
-
-  var getProperty = function(object, getter, property) {
-    // Use getter method if present; otherwise, get the property directly.
-    if (typeof object[getter] === 'function')
-      return object[getter]();
-    else
-      return object[property];
-  }
-
-  var setProperty = function(object, setter, property, value) {
-    // Use setter method if present; otherwise, set the property directly.
-    if (typeof object[setter] === 'function')
-      object[setter](value);
-    else
-      object[property] = value;
-  }
-
-  describe('InlineObject1', function() {
-    it('should create an instance of InlineObject1', function() {
-      // uncomment below and update the code to test InlineObject1
-      //var instane = new OpenApiPetstore.InlineObject1();
-      //expect(instance).to.be.a(OpenApiPetstore.InlineObject1);
-    });
-
-    it('should have the property additionalMetadata (base name: "additionalMetadata")', function() {
-      // uncomment below and update the code to test the property additionalMetadata
-      //var instane = new OpenApiPetstore.InlineObject1();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property file (base name: "file")', function() {
-      // uncomment below and update the code to test the property file
-      //var instane = new OpenApiPetstore.InlineObject1();
-      //expect(instance).to.be();
-    });
-
-  });
-
-}));
diff --git a/samples/client/petstore/javascript-es6/test/model/InlineObject2.spec.js b/samples/client/petstore/javascript-es6/test/model/InlineObject2.spec.js
deleted file mode 100644
index db91d138c39..00000000000
--- a/samples/client/petstore/javascript-es6/test/model/InlineObject2.spec.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- *
- */
-
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD.
-    define(['expect.js', '../../src/index'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    factory(require('expect.js'), require('../../src/index'));
-  } else {
-    // Browser globals (root is window)
-    factory(root.expect, root.OpenApiPetstore);
-  }
-}(this, function(expect, OpenApiPetstore) {
-  'use strict';
-
-  var instance;
-
-  beforeEach(function() {
-    instance = new OpenApiPetstore.InlineObject2();
-  });
-
-  var getProperty = function(object, getter, property) {
-    // Use getter method if present; otherwise, get the property directly.
-    if (typeof object[getter] === 'function')
-      return object[getter]();
-    else
-      return object[property];
-  }
-
-  var setProperty = function(object, setter, property, value) {
-    // Use setter method if present; otherwise, set the property directly.
-    if (typeof object[setter] === 'function')
-      object[setter](value);
-    else
-      object[property] = value;
-  }
-
-  describe('InlineObject2', function() {
-    it('should create an instance of InlineObject2', function() {
-      // uncomment below and update the code to test InlineObject2
-      //var instane = new OpenApiPetstore.InlineObject2();
-      //expect(instance).to.be.a(OpenApiPetstore.InlineObject2);
-    });
-
-    it('should have the property enumFormStringArray (base name: "enum_form_string_array")', function() {
-      // uncomment below and update the code to test the property enumFormStringArray
-      //var instane = new OpenApiPetstore.InlineObject2();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property enumFormString (base name: "enum_form_string")', function() {
-      // uncomment below and update the code to test the property enumFormString
-      //var instane = new OpenApiPetstore.InlineObject2();
-      //expect(instance).to.be();
-    });
-
-  });
-
-}));
diff --git a/samples/client/petstore/javascript-es6/test/model/InlineObject3.spec.js b/samples/client/petstore/javascript-es6/test/model/InlineObject3.spec.js
deleted file mode 100644
index 5e2647ed2c4..00000000000
--- a/samples/client/petstore/javascript-es6/test/model/InlineObject3.spec.js
+++ /dev/null
@@ -1,143 +0,0 @@
-/**
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- *
- */
-
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD.
-    define(['expect.js', '../../src/index'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    factory(require('expect.js'), require('../../src/index'));
-  } else {
-    // Browser globals (root is window)
-    factory(root.expect, root.OpenApiPetstore);
-  }
-}(this, function(expect, OpenApiPetstore) {
-  'use strict';
-
-  var instance;
-
-  beforeEach(function() {
-    instance = new OpenApiPetstore.InlineObject3();
-  });
-
-  var getProperty = function(object, getter, property) {
-    // Use getter method if present; otherwise, get the property directly.
-    if (typeof object[getter] === 'function')
-      return object[getter]();
-    else
-      return object[property];
-  }
-
-  var setProperty = function(object, setter, property, value) {
-    // Use setter method if present; otherwise, set the property directly.
-    if (typeof object[setter] === 'function')
-      object[setter](value);
-    else
-      object[property] = value;
-  }
-
-  describe('InlineObject3', function() {
-    it('should create an instance of InlineObject3', function() {
-      // uncomment below and update the code to test InlineObject3
-      //var instane = new OpenApiPetstore.InlineObject3();
-      //expect(instance).to.be.a(OpenApiPetstore.InlineObject3);
-    });
-
-    it('should have the property integer (base name: "integer")', function() {
-      // uncomment below and update the code to test the property integer
-      //var instane = new OpenApiPetstore.InlineObject3();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property int32 (base name: "int32")', function() {
-      // uncomment below and update the code to test the property int32
-      //var instane = new OpenApiPetstore.InlineObject3();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property int64 (base name: "int64")', function() {
-      // uncomment below and update the code to test the property int64
-      //var instane = new OpenApiPetstore.InlineObject3();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property _number (base name: "number")', function() {
-      // uncomment below and update the code to test the property _number
-      //var instane = new OpenApiPetstore.InlineObject3();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property _float (base name: "float")', function() {
-      // uncomment below and update the code to test the property _float
-      //var instane = new OpenApiPetstore.InlineObject3();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property _double (base name: "double")', function() {
-      // uncomment below and update the code to test the property _double
-      //var instane = new OpenApiPetstore.InlineObject3();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property _string (base name: "string")', function() {
-      // uncomment below and update the code to test the property _string
-      //var instane = new OpenApiPetstore.InlineObject3();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property patternWithoutDelimiter (base name: "pattern_without_delimiter")', function() {
-      // uncomment below and update the code to test the property patternWithoutDelimiter
-      //var instane = new OpenApiPetstore.InlineObject3();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property _byte (base name: "byte")', function() {
-      // uncomment below and update the code to test the property _byte
-      //var instane = new OpenApiPetstore.InlineObject3();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property binary (base name: "binary")', function() {
-      // uncomment below and update the code to test the property binary
-      //var instane = new OpenApiPetstore.InlineObject3();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property _date (base name: "date")', function() {
-      // uncomment below and update the code to test the property _date
-      //var instane = new OpenApiPetstore.InlineObject3();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property dateTime (base name: "dateTime")', function() {
-      // uncomment below and update the code to test the property dateTime
-      //var instane = new OpenApiPetstore.InlineObject3();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property password (base name: "password")', function() {
-      // uncomment below and update the code to test the property password
-      //var instane = new OpenApiPetstore.InlineObject3();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property callback (base name: "callback")', function() {
-      // uncomment below and update the code to test the property callback
-      //var instane = new OpenApiPetstore.InlineObject3();
-      //expect(instance).to.be();
-    });
-
-  });
-
-}));
diff --git a/samples/client/petstore/javascript-es6/test/model/InlineObject4.spec.js b/samples/client/petstore/javascript-es6/test/model/InlineObject4.spec.js
deleted file mode 100644
index 10e6acf7e7c..00000000000
--- a/samples/client/petstore/javascript-es6/test/model/InlineObject4.spec.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- *
- */
-
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD.
-    define(['expect.js', '../../src/index'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    factory(require('expect.js'), require('../../src/index'));
-  } else {
-    // Browser globals (root is window)
-    factory(root.expect, root.OpenApiPetstore);
-  }
-}(this, function(expect, OpenApiPetstore) {
-  'use strict';
-
-  var instance;
-
-  beforeEach(function() {
-    instance = new OpenApiPetstore.InlineObject4();
-  });
-
-  var getProperty = function(object, getter, property) {
-    // Use getter method if present; otherwise, get the property directly.
-    if (typeof object[getter] === 'function')
-      return object[getter]();
-    else
-      return object[property];
-  }
-
-  var setProperty = function(object, setter, property, value) {
-    // Use setter method if present; otherwise, set the property directly.
-    if (typeof object[setter] === 'function')
-      object[setter](value);
-    else
-      object[property] = value;
-  }
-
-  describe('InlineObject4', function() {
-    it('should create an instance of InlineObject4', function() {
-      // uncomment below and update the code to test InlineObject4
-      //var instane = new OpenApiPetstore.InlineObject4();
-      //expect(instance).to.be.a(OpenApiPetstore.InlineObject4);
-    });
-
-    it('should have the property param (base name: "param")', function() {
-      // uncomment below and update the code to test the property param
-      //var instane = new OpenApiPetstore.InlineObject4();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property param2 (base name: "param2")', function() {
-      // uncomment below and update the code to test the property param2
-      //var instane = new OpenApiPetstore.InlineObject4();
-      //expect(instance).to.be();
-    });
-
-  });
-
-}));
diff --git a/samples/client/petstore/javascript-es6/test/model/InlineObject5.spec.js b/samples/client/petstore/javascript-es6/test/model/InlineObject5.spec.js
deleted file mode 100644
index 13f4fa6bc8d..00000000000
--- a/samples/client/petstore/javascript-es6/test/model/InlineObject5.spec.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- *
- */
-
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD.
-    define(['expect.js', '../../src/index'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    factory(require('expect.js'), require('../../src/index'));
-  } else {
-    // Browser globals (root is window)
-    factory(root.expect, root.OpenApiPetstore);
-  }
-}(this, function(expect, OpenApiPetstore) {
-  'use strict';
-
-  var instance;
-
-  beforeEach(function() {
-    instance = new OpenApiPetstore.InlineObject5();
-  });
-
-  var getProperty = function(object, getter, property) {
-    // Use getter method if present; otherwise, get the property directly.
-    if (typeof object[getter] === 'function')
-      return object[getter]();
-    else
-      return object[property];
-  }
-
-  var setProperty = function(object, setter, property, value) {
-    // Use setter method if present; otherwise, set the property directly.
-    if (typeof object[setter] === 'function')
-      object[setter](value);
-    else
-      object[property] = value;
-  }
-
-  describe('InlineObject5', function() {
-    it('should create an instance of InlineObject5', function() {
-      // uncomment below and update the code to test InlineObject5
-      //var instane = new OpenApiPetstore.InlineObject5();
-      //expect(instance).to.be.a(OpenApiPetstore.InlineObject5);
-    });
-
-    it('should have the property additionalMetadata (base name: "additionalMetadata")', function() {
-      // uncomment below and update the code to test the property additionalMetadata
-      //var instane = new OpenApiPetstore.InlineObject5();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property requiredFile (base name: "requiredFile")', function() {
-      // uncomment below and update the code to test the property requiredFile
-      //var instane = new OpenApiPetstore.InlineObject5();
-      //expect(instance).to.be();
-    });
-
-  });
-
-}));
diff --git a/samples/client/petstore/javascript-es6/test/model/InlineResponseDefault.spec.js b/samples/client/petstore/javascript-es6/test/model/InlineResponseDefault.spec.js
index eb5491bf8a8..c63e306630d 100644
--- a/samples/client/petstore/javascript-es6/test/model/InlineResponseDefault.spec.js
+++ b/samples/client/petstore/javascript-es6/test/model/InlineResponseDefault.spec.js
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -14,10 +14,10 @@
 (function(root, factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD.
-    define(['expect.js', '../../src/index'], factory);
+    define(['expect.js', process.cwd()+'/src/index'], factory);
   } else if (typeof module === 'object' && module.exports) {
     // CommonJS-like environments that support module.exports, like Node.
-    factory(require('expect.js'), require('../../src/index'));
+    factory(require('expect.js'), require(process.cwd()+'/src/index'));
   } else {
     // Browser globals (root is window)
     factory(root.expect, root.OpenApiPetstore);
@@ -56,7 +56,7 @@
 
     it('should have the property _string (base name: "string")', function() {
       // uncomment below and update the code to test the property _string
-      //var instane = new OpenApiPetstore.InlineResponseDefault();
+      //var instance = new OpenApiPetstore.InlineResponseDefault();
       //expect(instance).to.be();
     });
 
diff --git a/samples/client/petstore/javascript-promise-es6/.openapi-generator/FILES b/samples/client/petstore/javascript-promise-es6/.openapi-generator/FILES
index 79706e91539..85edf0d1717 100644
--- a/samples/client/petstore/javascript-promise-es6/.openapi-generator/FILES
+++ b/samples/client/petstore/javascript-promise-es6/.openapi-generator/FILES
@@ -29,12 +29,6 @@ docs/Foo.md
 docs/FormatTest.md
 docs/HasOnlyReadOnly.md
 docs/HealthCheckResult.md
-docs/InlineObject.md
-docs/InlineObject1.md
-docs/InlineObject2.md
-docs/InlineObject3.md
-docs/InlineObject4.md
-docs/InlineObject5.md
 docs/InlineResponseDefault.md
 docs/List.md
 docs/MapTest.md
@@ -93,12 +87,6 @@ src/model/Foo.js
 src/model/FormatTest.js
 src/model/HasOnlyReadOnly.js
 src/model/HealthCheckResult.js
-src/model/InlineObject.js
-src/model/InlineObject1.js
-src/model/InlineObject2.js
-src/model/InlineObject3.js
-src/model/InlineObject4.js
-src/model/InlineObject5.js
 src/model/InlineResponseDefault.js
 src/model/List.js
 src/model/MapTest.js
diff --git a/samples/client/petstore/javascript-promise-es6/README.md b/samples/client/petstore/javascript-promise-es6/README.md
index a890453dfa5..2f487810d00 100644
--- a/samples/client/petstore/javascript-promise-es6/README.md
+++ b/samples/client/petstore/javascript-promise-es6/README.md
@@ -184,12 +184,6 @@ Class | Method | HTTP request | Description
  - [OpenApiPetstore.FormatTest](docs/FormatTest.md)
  - [OpenApiPetstore.HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [OpenApiPetstore.HealthCheckResult](docs/HealthCheckResult.md)
- - [OpenApiPetstore.InlineObject](docs/InlineObject.md)
- - [OpenApiPetstore.InlineObject1](docs/InlineObject1.md)
- - [OpenApiPetstore.InlineObject2](docs/InlineObject2.md)
- - [OpenApiPetstore.InlineObject3](docs/InlineObject3.md)
- - [OpenApiPetstore.InlineObject4](docs/InlineObject4.md)
- - [OpenApiPetstore.InlineObject5](docs/InlineObject5.md)
  - [OpenApiPetstore.InlineResponseDefault](docs/InlineResponseDefault.md)
  - [OpenApiPetstore.List](docs/List.md)
  - [OpenApiPetstore.MapTest](docs/MapTest.md)
diff --git a/samples/client/petstore/javascript-promise-es6/src/index.js b/samples/client/petstore/javascript-promise-es6/src/index.js
index 1a0cda3b1dc..33321542c64 100644
--- a/samples/client/petstore/javascript-promise-es6/src/index.js
+++ b/samples/client/petstore/javascript-promise-es6/src/index.js
@@ -36,12 +36,6 @@ import Foo from './model/Foo';
 import FormatTest from './model/FormatTest';
 import HasOnlyReadOnly from './model/HasOnlyReadOnly';
 import HealthCheckResult from './model/HealthCheckResult';
-import InlineObject from './model/InlineObject';
-import InlineObject1 from './model/InlineObject1';
-import InlineObject2 from './model/InlineObject2';
-import InlineObject3 from './model/InlineObject3';
-import InlineObject4 from './model/InlineObject4';
-import InlineObject5 from './model/InlineObject5';
 import InlineResponseDefault from './model/InlineResponseDefault';
 import List from './model/List';
 import MapTest from './model/MapTest';
@@ -247,42 +241,6 @@ export {
      */
     HealthCheckResult,
 
-    /**
-     * The InlineObject model constructor.
-     * @property {module:model/InlineObject}
-     */
-    InlineObject,
-
-    /**
-     * The InlineObject1 model constructor.
-     * @property {module:model/InlineObject1}
-     */
-    InlineObject1,
-
-    /**
-     * The InlineObject2 model constructor.
-     * @property {module:model/InlineObject2}
-     */
-    InlineObject2,
-
-    /**
-     * The InlineObject3 model constructor.
-     * @property {module:model/InlineObject3}
-     */
-    InlineObject3,
-
-    /**
-     * The InlineObject4 model constructor.
-     * @property {module:model/InlineObject4}
-     */
-    InlineObject4,
-
-    /**
-     * The InlineObject5 model constructor.
-     * @property {module:model/InlineObject5}
-     */
-    InlineObject5,
-
     /**
      * The InlineResponseDefault model constructor.
      * @property {module:model/InlineResponseDefault}
diff --git a/samples/client/petstore/javascript-promise-es6/test/model/InlineObject.spec.js b/samples/client/petstore/javascript-promise-es6/test/model/InlineObject.spec.js
deleted file mode 100644
index 9dd0a26e760..00000000000
--- a/samples/client/petstore/javascript-promise-es6/test/model/InlineObject.spec.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- *
- */
-
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD.
-    define(['expect.js', process.cwd()+'/src/index'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    factory(require('expect.js'), require(process.cwd()+'/src/index'));
-  } else {
-    // Browser globals (root is window)
-    factory(root.expect, root.OpenApiPetstore);
-  }
-}(this, function(expect, OpenApiPetstore) {
-  'use strict';
-
-  var instance;
-
-  beforeEach(function() {
-    instance = new OpenApiPetstore.InlineObject();
-  });
-
-  var getProperty = function(object, getter, property) {
-    // Use getter method if present; otherwise, get the property directly.
-    if (typeof object[getter] === 'function')
-      return object[getter]();
-    else
-      return object[property];
-  }
-
-  var setProperty = function(object, setter, property, value) {
-    // Use setter method if present; otherwise, set the property directly.
-    if (typeof object[setter] === 'function')
-      object[setter](value);
-    else
-      object[property] = value;
-  }
-
-  describe('InlineObject', function() {
-    it('should create an instance of InlineObject', function() {
-      // uncomment below and update the code to test InlineObject
-      //var instane = new OpenApiPetstore.InlineObject();
-      //expect(instance).to.be.a(OpenApiPetstore.InlineObject);
-    });
-
-    it('should have the property name (base name: "name")', function() {
-      // uncomment below and update the code to test the property name
-      //var instane = new OpenApiPetstore.InlineObject();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property status (base name: "status")', function() {
-      // uncomment below and update the code to test the property status
-      //var instane = new OpenApiPetstore.InlineObject();
-      //expect(instance).to.be();
-    });
-
-  });
-
-}));
diff --git a/samples/client/petstore/javascript-promise-es6/test/model/InlineObject1.spec.js b/samples/client/petstore/javascript-promise-es6/test/model/InlineObject1.spec.js
deleted file mode 100644
index 6a31acb18fb..00000000000
--- a/samples/client/petstore/javascript-promise-es6/test/model/InlineObject1.spec.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- *
- */
-
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD.
-    define(['expect.js', process.cwd()+'/src/index'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    factory(require('expect.js'), require(process.cwd()+'/src/index'));
-  } else {
-    // Browser globals (root is window)
-    factory(root.expect, root.OpenApiPetstore);
-  }
-}(this, function(expect, OpenApiPetstore) {
-  'use strict';
-
-  var instance;
-
-  beforeEach(function() {
-    instance = new OpenApiPetstore.InlineObject1();
-  });
-
-  var getProperty = function(object, getter, property) {
-    // Use getter method if present; otherwise, get the property directly.
-    if (typeof object[getter] === 'function')
-      return object[getter]();
-    else
-      return object[property];
-  }
-
-  var setProperty = function(object, setter, property, value) {
-    // Use setter method if present; otherwise, set the property directly.
-    if (typeof object[setter] === 'function')
-      object[setter](value);
-    else
-      object[property] = value;
-  }
-
-  describe('InlineObject1', function() {
-    it('should create an instance of InlineObject1', function() {
-      // uncomment below and update the code to test InlineObject1
-      //var instane = new OpenApiPetstore.InlineObject1();
-      //expect(instance).to.be.a(OpenApiPetstore.InlineObject1);
-    });
-
-    it('should have the property additionalMetadata (base name: "additionalMetadata")', function() {
-      // uncomment below and update the code to test the property additionalMetadata
-      //var instane = new OpenApiPetstore.InlineObject1();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property file (base name: "file")', function() {
-      // uncomment below and update the code to test the property file
-      //var instane = new OpenApiPetstore.InlineObject1();
-      //expect(instance).to.be();
-    });
-
-  });
-
-}));
diff --git a/samples/client/petstore/javascript-promise-es6/test/model/InlineObject2.spec.js b/samples/client/petstore/javascript-promise-es6/test/model/InlineObject2.spec.js
deleted file mode 100644
index 1d7da6eb6b3..00000000000
--- a/samples/client/petstore/javascript-promise-es6/test/model/InlineObject2.spec.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- *
- */
-
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD.
-    define(['expect.js', process.cwd()+'/src/index'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    factory(require('expect.js'), require(process.cwd()+'/src/index'));
-  } else {
-    // Browser globals (root is window)
-    factory(root.expect, root.OpenApiPetstore);
-  }
-}(this, function(expect, OpenApiPetstore) {
-  'use strict';
-
-  var instance;
-
-  beforeEach(function() {
-    instance = new OpenApiPetstore.InlineObject2();
-  });
-
-  var getProperty = function(object, getter, property) {
-    // Use getter method if present; otherwise, get the property directly.
-    if (typeof object[getter] === 'function')
-      return object[getter]();
-    else
-      return object[property];
-  }
-
-  var setProperty = function(object, setter, property, value) {
-    // Use setter method if present; otherwise, set the property directly.
-    if (typeof object[setter] === 'function')
-      object[setter](value);
-    else
-      object[property] = value;
-  }
-
-  describe('InlineObject2', function() {
-    it('should create an instance of InlineObject2', function() {
-      // uncomment below and update the code to test InlineObject2
-      //var instane = new OpenApiPetstore.InlineObject2();
-      //expect(instance).to.be.a(OpenApiPetstore.InlineObject2);
-    });
-
-    it('should have the property enumFormStringArray (base name: "enum_form_string_array")', function() {
-      // uncomment below and update the code to test the property enumFormStringArray
-      //var instane = new OpenApiPetstore.InlineObject2();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property enumFormString (base name: "enum_form_string")', function() {
-      // uncomment below and update the code to test the property enumFormString
-      //var instane = new OpenApiPetstore.InlineObject2();
-      //expect(instance).to.be();
-    });
-
-  });
-
-}));
diff --git a/samples/client/petstore/javascript-promise-es6/test/model/InlineObject3.spec.js b/samples/client/petstore/javascript-promise-es6/test/model/InlineObject3.spec.js
deleted file mode 100644
index 5265e446290..00000000000
--- a/samples/client/petstore/javascript-promise-es6/test/model/InlineObject3.spec.js
+++ /dev/null
@@ -1,143 +0,0 @@
-/**
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- *
- */
-
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD.
-    define(['expect.js', process.cwd()+'/src/index'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    factory(require('expect.js'), require(process.cwd()+'/src/index'));
-  } else {
-    // Browser globals (root is window)
-    factory(root.expect, root.OpenApiPetstore);
-  }
-}(this, function(expect, OpenApiPetstore) {
-  'use strict';
-
-  var instance;
-
-  beforeEach(function() {
-    instance = new OpenApiPetstore.InlineObject3();
-  });
-
-  var getProperty = function(object, getter, property) {
-    // Use getter method if present; otherwise, get the property directly.
-    if (typeof object[getter] === 'function')
-      return object[getter]();
-    else
-      return object[property];
-  }
-
-  var setProperty = function(object, setter, property, value) {
-    // Use setter method if present; otherwise, set the property directly.
-    if (typeof object[setter] === 'function')
-      object[setter](value);
-    else
-      object[property] = value;
-  }
-
-  describe('InlineObject3', function() {
-    it('should create an instance of InlineObject3', function() {
-      // uncomment below and update the code to test InlineObject3
-      //var instane = new OpenApiPetstore.InlineObject3();
-      //expect(instance).to.be.a(OpenApiPetstore.InlineObject3);
-    });
-
-    it('should have the property integer (base name: "integer")', function() {
-      // uncomment below and update the code to test the property integer
-      //var instane = new OpenApiPetstore.InlineObject3();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property int32 (base name: "int32")', function() {
-      // uncomment below and update the code to test the property int32
-      //var instane = new OpenApiPetstore.InlineObject3();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property int64 (base name: "int64")', function() {
-      // uncomment below and update the code to test the property int64
-      //var instane = new OpenApiPetstore.InlineObject3();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property _number (base name: "number")', function() {
-      // uncomment below and update the code to test the property _number
-      //var instane = new OpenApiPetstore.InlineObject3();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property _float (base name: "float")', function() {
-      // uncomment below and update the code to test the property _float
-      //var instane = new OpenApiPetstore.InlineObject3();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property _double (base name: "double")', function() {
-      // uncomment below and update the code to test the property _double
-      //var instane = new OpenApiPetstore.InlineObject3();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property _string (base name: "string")', function() {
-      // uncomment below and update the code to test the property _string
-      //var instane = new OpenApiPetstore.InlineObject3();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property patternWithoutDelimiter (base name: "pattern_without_delimiter")', function() {
-      // uncomment below and update the code to test the property patternWithoutDelimiter
-      //var instane = new OpenApiPetstore.InlineObject3();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property _byte (base name: "byte")', function() {
-      // uncomment below and update the code to test the property _byte
-      //var instane = new OpenApiPetstore.InlineObject3();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property binary (base name: "binary")', function() {
-      // uncomment below and update the code to test the property binary
-      //var instane = new OpenApiPetstore.InlineObject3();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property _date (base name: "date")', function() {
-      // uncomment below and update the code to test the property _date
-      //var instane = new OpenApiPetstore.InlineObject3();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property dateTime (base name: "dateTime")', function() {
-      // uncomment below and update the code to test the property dateTime
-      //var instane = new OpenApiPetstore.InlineObject3();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property password (base name: "password")', function() {
-      // uncomment below and update the code to test the property password
-      //var instane = new OpenApiPetstore.InlineObject3();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property callback (base name: "callback")', function() {
-      // uncomment below and update the code to test the property callback
-      //var instane = new OpenApiPetstore.InlineObject3();
-      //expect(instance).to.be();
-    });
-
-  });
-
-}));
diff --git a/samples/client/petstore/javascript-promise-es6/test/model/InlineObject4.spec.js b/samples/client/petstore/javascript-promise-es6/test/model/InlineObject4.spec.js
deleted file mode 100644
index 0324721e117..00000000000
--- a/samples/client/petstore/javascript-promise-es6/test/model/InlineObject4.spec.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- *
- */
-
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD.
-    define(['expect.js', process.cwd()+'/src/index'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    factory(require('expect.js'), require(process.cwd()+'/src/index'));
-  } else {
-    // Browser globals (root is window)
-    factory(root.expect, root.OpenApiPetstore);
-  }
-}(this, function(expect, OpenApiPetstore) {
-  'use strict';
-
-  var instance;
-
-  beforeEach(function() {
-    instance = new OpenApiPetstore.InlineObject4();
-  });
-
-  var getProperty = function(object, getter, property) {
-    // Use getter method if present; otherwise, get the property directly.
-    if (typeof object[getter] === 'function')
-      return object[getter]();
-    else
-      return object[property];
-  }
-
-  var setProperty = function(object, setter, property, value) {
-    // Use setter method if present; otherwise, set the property directly.
-    if (typeof object[setter] === 'function')
-      object[setter](value);
-    else
-      object[property] = value;
-  }
-
-  describe('InlineObject4', function() {
-    it('should create an instance of InlineObject4', function() {
-      // uncomment below and update the code to test InlineObject4
-      //var instane = new OpenApiPetstore.InlineObject4();
-      //expect(instance).to.be.a(OpenApiPetstore.InlineObject4);
-    });
-
-    it('should have the property param (base name: "param")', function() {
-      // uncomment below and update the code to test the property param
-      //var instane = new OpenApiPetstore.InlineObject4();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property param2 (base name: "param2")', function() {
-      // uncomment below and update the code to test the property param2
-      //var instane = new OpenApiPetstore.InlineObject4();
-      //expect(instance).to.be();
-    });
-
-  });
-
-}));
diff --git a/samples/client/petstore/javascript-promise-es6/test/model/InlineObject5.spec.js b/samples/client/petstore/javascript-promise-es6/test/model/InlineObject5.spec.js
deleted file mode 100644
index cabcbb1404c..00000000000
--- a/samples/client/petstore/javascript-promise-es6/test/model/InlineObject5.spec.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- *
- */
-
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD.
-    define(['expect.js', process.cwd()+'/src/index'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    factory(require('expect.js'), require(process.cwd()+'/src/index'));
-  } else {
-    // Browser globals (root is window)
-    factory(root.expect, root.OpenApiPetstore);
-  }
-}(this, function(expect, OpenApiPetstore) {
-  'use strict';
-
-  var instance;
-
-  beforeEach(function() {
-    instance = new OpenApiPetstore.InlineObject5();
-  });
-
-  var getProperty = function(object, getter, property) {
-    // Use getter method if present; otherwise, get the property directly.
-    if (typeof object[getter] === 'function')
-      return object[getter]();
-    else
-      return object[property];
-  }
-
-  var setProperty = function(object, setter, property, value) {
-    // Use setter method if present; otherwise, set the property directly.
-    if (typeof object[setter] === 'function')
-      object[setter](value);
-    else
-      object[property] = value;
-  }
-
-  describe('InlineObject5', function() {
-    it('should create an instance of InlineObject5', function() {
-      // uncomment below and update the code to test InlineObject5
-      //var instane = new OpenApiPetstore.InlineObject5();
-      //expect(instance).to.be.a(OpenApiPetstore.InlineObject5);
-    });
-
-    it('should have the property additionalMetadata (base name: "additionalMetadata")', function() {
-      // uncomment below and update the code to test the property additionalMetadata
-      //var instane = new OpenApiPetstore.InlineObject5();
-      //expect(instance).to.be();
-    });
-
-    it('should have the property requiredFile (base name: "requiredFile")', function() {
-      // uncomment below and update the code to test the property requiredFile
-      //var instane = new OpenApiPetstore.InlineObject5();
-      //expect(instance).to.be();
-    });
-
-  });
-
-}));
diff --git a/samples/client/petstore/javascript-promise-es6/test/model/InlineResponseDefault.spec.js b/samples/client/petstore/javascript-promise-es6/test/model/InlineResponseDefault.spec.js
index bec91c16234..c63e306630d 100644
--- a/samples/client/petstore/javascript-promise-es6/test/model/InlineResponseDefault.spec.js
+++ b/samples/client/petstore/javascript-promise-es6/test/model/InlineResponseDefault.spec.js
@@ -56,7 +56,7 @@
 
     it('should have the property _string (base name: "string")', function() {
       // uncomment below and update the code to test the property _string
-      //var instane = new OpenApiPetstore.InlineResponseDefault();
+      //var instance = new OpenApiPetstore.InlineResponseDefault();
       //expect(instance).to.be();
     });
 
diff --git a/samples/client/petstore/lua/.openapi-generator/FILES b/samples/client/petstore/lua/.openapi-generator/FILES
index 5d04ee8dfb8..258aa2383b3 100644
--- a/samples/client/petstore/lua/.openapi-generator/FILES
+++ b/samples/client/petstore/lua/.openapi-generator/FILES
@@ -6,8 +6,6 @@ petstore/api/store_api.lua
 petstore/api/user_api.lua
 petstore/model/api_response.lua
 petstore/model/category.lua
-petstore/model/inline_object.lua
-petstore/model/inline_object_1.lua
 petstore/model/order.lua
 petstore/model/pet.lua
 petstore/model/tag.lua
diff --git a/samples/client/petstore/lua/petstore-1.0.0-1.rockspec b/samples/client/petstore/lua/petstore-1.0.0-1.rockspec
index 7f8afbe3b89..d6b7f2f4ccf 100644
--- a/samples/client/petstore/lua/petstore-1.0.0-1.rockspec
+++ b/samples/client/petstore/lua/petstore-1.0.0-1.rockspec
@@ -28,8 +28,6 @@ build = {
 		["petstore.api.user_api"] = "petstore/api/user_api.lua";
 		["petstore.model.api_response"] = "petstore/model/api_response.lua";
 		["petstore.model.category"] = "petstore/model/category.lua";
-		["petstore.model.inline_object"] = "petstore/model/inline_object.lua";
-		["petstore.model.inline_object_1"] = "petstore/model/inline_object_1.lua";
 		["petstore.model.order"] = "petstore/model/order.lua";
 		["petstore.model.pet"] = "petstore/model/pet.lua";
 		["petstore.model.tag"] = "petstore/model/tag.lua";
diff --git a/samples/client/petstore/objc/core-data/.openapi-generator/FILES b/samples/client/petstore/objc/core-data/.openapi-generator/FILES
index 3a1c6b9364a..6f6cd95849a 100644
--- a/samples/client/petstore/objc/core-data/.openapi-generator/FILES
+++ b/samples/client/petstore/objc/core-data/.openapi-generator/FILES
@@ -35,18 +35,6 @@ SwaggerClient/Model/SWGCategoryManagedObject.h
 SwaggerClient/Model/SWGCategoryManagedObject.m
 SwaggerClient/Model/SWGCategoryManagedObjectBuilder.h
 SwaggerClient/Model/SWGCategoryManagedObjectBuilder.m
-SwaggerClient/Model/SWGInlineObject.h
-SwaggerClient/Model/SWGInlineObject.m
-SwaggerClient/Model/SWGInlineObject1.h
-SwaggerClient/Model/SWGInlineObject1.m
-SwaggerClient/Model/SWGInlineObject1ManagedObject.h
-SwaggerClient/Model/SWGInlineObject1ManagedObject.m
-SwaggerClient/Model/SWGInlineObject1ManagedObjectBuilder.h
-SwaggerClient/Model/SWGInlineObject1ManagedObjectBuilder.m
-SwaggerClient/Model/SWGInlineObjectManagedObject.h
-SwaggerClient/Model/SWGInlineObjectManagedObject.m
-SwaggerClient/Model/SWGInlineObjectManagedObjectBuilder.h
-SwaggerClient/Model/SWGInlineObjectManagedObjectBuilder.m
 SwaggerClient/Model/SWGModel.xcdatamodeld/.xccurrentversion
 SwaggerClient/Model/SWGModel.xcdatamodeld/SWGModel.xcdatamodel/contents
 SwaggerClient/Model/SWGOrder.h
@@ -74,8 +62,6 @@ SwaggerClient/Model/SWGUserManagedObject.m
 SwaggerClient/Model/SWGUserManagedObjectBuilder.h
 SwaggerClient/Model/SWGUserManagedObjectBuilder.m
 docs/SWGCategory.md
-docs/SWGInlineObject.md
-docs/SWGInlineObject1.md
 docs/SWGOrder.md
 docs/SWGPet.md
 docs/SWGPetApi.md
diff --git a/samples/client/petstore/objc/core-data/README.md b/samples/client/petstore/objc/core-data/README.md
index ac24d7bfc60..10694bd5135 100644
--- a/samples/client/petstore/objc/core-data/README.md
+++ b/samples/client/petstore/objc/core-data/README.md
@@ -42,8 +42,6 @@ Import the following:
 #import <SwaggerClient/SWGDefaultConfiguration.h>
 // load models
 #import <SwaggerClient/SWGCategory.h>
-#import <SwaggerClient/SWGInlineObject.h>
-#import <SwaggerClient/SWGInlineObject1.h>
 #import <SwaggerClient/SWGOrder.h>
 #import <SwaggerClient/SWGPet.h>
 #import <SwaggerClient/SWGTag.h>
@@ -116,8 +114,6 @@ Class | Method | HTTP request | Description
 ## Documentation For Models
 
  - [SWGCategory](docs/SWGCategory.md)
- - [SWGInlineObject](docs/SWGInlineObject.md)
- - [SWGInlineObject1](docs/SWGInlineObject1.md)
  - [SWGOrder](docs/SWGOrder.md)
  - [SWGPet](docs/SWGPet.md)
  - [SWGTag](docs/SWGTag.md)
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGModel.xcdatamodeld/SWGModel.xcdatamodel/contents b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGModel.xcdatamodeld/SWGModel.xcdatamodel/contents
index 35f1c665a08..4ec7a3b456b 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGModel.xcdatamodeld/SWGModel.xcdatamodel/contents
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGModel.xcdatamodeld/SWGModel.xcdatamodel/contents
@@ -5,14 +5,6 @@
         <attribute name="_id" optional="YES" attributeType="Double" syncable="YES"/>
         <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
     </entity>
-    <entity name="SWGInlineObjectManagedObject" representedClassName="SWGInlineObjectManagedObject" syncable="YES">
-        <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="status" optional="YES" attributeType="String" syncable="YES"/>
-    </entity>
-    <entity name="SWGInlineObject1ManagedObject" representedClassName="SWGInlineObject1ManagedObject" syncable="YES">
-        <attribute name="additionalMetadata" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="file" optional="YES" attributeType="Binary" syncable="YES"/>
-    </entity>
     <entity name="SWGOrderManagedObject" representedClassName="SWGOrderManagedObject" syncable="YES">
         <attribute name="_id" optional="YES" attributeType="Double" syncable="YES"/>
         <attribute name="petId" optional="YES" attributeType="Double" syncable="YES"/>
diff --git a/samples/client/petstore/objc/default/.openapi-generator/FILES b/samples/client/petstore/objc/default/.openapi-generator/FILES
index d0985156c04..02311083874 100644
--- a/samples/client/petstore/objc/default/.openapi-generator/FILES
+++ b/samples/client/petstore/objc/default/.openapi-generator/FILES
@@ -31,10 +31,6 @@ SwaggerClient/Core/SWGSanitizer.h
 SwaggerClient/Core/SWGSanitizer.m
 SwaggerClient/Model/SWGCategory.h
 SwaggerClient/Model/SWGCategory.m
-SwaggerClient/Model/SWGInlineObject.h
-SwaggerClient/Model/SWGInlineObject.m
-SwaggerClient/Model/SWGInlineObject1.h
-SwaggerClient/Model/SWGInlineObject1.m
 SwaggerClient/Model/SWGOrder.h
 SwaggerClient/Model/SWGOrder.m
 SwaggerClient/Model/SWGPet.h
@@ -44,8 +40,6 @@ SwaggerClient/Model/SWGTag.m
 SwaggerClient/Model/SWGUser.h
 SwaggerClient/Model/SWGUser.m
 docs/SWGCategory.md
-docs/SWGInlineObject.md
-docs/SWGInlineObject1.md
 docs/SWGOrder.md
 docs/SWGPet.md
 docs/SWGPetApi.md
diff --git a/samples/client/petstore/objc/default/README.md b/samples/client/petstore/objc/default/README.md
index ac24d7bfc60..10694bd5135 100644
--- a/samples/client/petstore/objc/default/README.md
+++ b/samples/client/petstore/objc/default/README.md
@@ -42,8 +42,6 @@ Import the following:
 #import <SwaggerClient/SWGDefaultConfiguration.h>
 // load models
 #import <SwaggerClient/SWGCategory.h>
-#import <SwaggerClient/SWGInlineObject.h>
-#import <SwaggerClient/SWGInlineObject1.h>
 #import <SwaggerClient/SWGOrder.h>
 #import <SwaggerClient/SWGPet.h>
 #import <SwaggerClient/SWGTag.h>
@@ -116,8 +114,6 @@ Class | Method | HTTP request | Description
 ## Documentation For Models
 
  - [SWGCategory](docs/SWGCategory.md)
- - [SWGInlineObject](docs/SWGInlineObject.md)
- - [SWGInlineObject1](docs/SWGInlineObject1.md)
  - [SWGOrder](docs/SWGOrder.md)
  - [SWGPet](docs/SWGPet.md)
  - [SWGTag](docs/SWGTag.md)
diff --git a/samples/client/petstore/perl/.openapi-generator/FILES b/samples/client/petstore/perl/.openapi-generator/FILES
index 6c10be668a0..bcb69b10956 100644
--- a/samples/client/petstore/perl/.openapi-generator/FILES
+++ b/samples/client/petstore/perl/.openapi-generator/FILES
@@ -29,12 +29,6 @@ docs/Foo.md
 docs/FormatTest.md
 docs/HasOnlyReadOnly.md
 docs/HealthCheckResult.md
-docs/InlineObject.md
-docs/InlineObject1.md
-docs/InlineObject2.md
-docs/InlineObject3.md
-docs/InlineObject4.md
-docs/InlineObject5.md
 docs/InlineResponseDefault.md
 docs/List.md
 docs/MapTest.md
@@ -89,12 +83,6 @@ lib/WWW/OpenAPIClient/Object/Foo.pm
 lib/WWW/OpenAPIClient/Object/FormatTest.pm
 lib/WWW/OpenAPIClient/Object/HasOnlyReadOnly.pm
 lib/WWW/OpenAPIClient/Object/HealthCheckResult.pm
-lib/WWW/OpenAPIClient/Object/InlineObject.pm
-lib/WWW/OpenAPIClient/Object/InlineObject1.pm
-lib/WWW/OpenAPIClient/Object/InlineObject2.pm
-lib/WWW/OpenAPIClient/Object/InlineObject3.pm
-lib/WWW/OpenAPIClient/Object/InlineObject4.pm
-lib/WWW/OpenAPIClient/Object/InlineObject5.pm
 lib/WWW/OpenAPIClient/Object/InlineResponseDefault.pm
 lib/WWW/OpenAPIClient/Object/List.pm
 lib/WWW/OpenAPIClient/Object/MapTest.pm
diff --git a/samples/client/petstore/perl/README.md b/samples/client/petstore/perl/README.md
index 47e1ef35732..69d1869c143 100644
--- a/samples/client/petstore/perl/README.md
+++ b/samples/client/petstore/perl/README.md
@@ -256,12 +256,6 @@ use WWW::OpenAPIClient::Object::Foo;
 use WWW::OpenAPIClient::Object::FormatTest;
 use WWW::OpenAPIClient::Object::HasOnlyReadOnly;
 use WWW::OpenAPIClient::Object::HealthCheckResult;
-use WWW::OpenAPIClient::Object::InlineObject;
-use WWW::OpenAPIClient::Object::InlineObject1;
-use WWW::OpenAPIClient::Object::InlineObject2;
-use WWW::OpenAPIClient::Object::InlineObject3;
-use WWW::OpenAPIClient::Object::InlineObject4;
-use WWW::OpenAPIClient::Object::InlineObject5;
 use WWW::OpenAPIClient::Object::InlineResponseDefault;
 use WWW::OpenAPIClient::Object::List;
 use WWW::OpenAPIClient::Object::MapTest;
@@ -325,12 +319,6 @@ use WWW::OpenAPIClient::Object::Foo;
 use WWW::OpenAPIClient::Object::FormatTest;
 use WWW::OpenAPIClient::Object::HasOnlyReadOnly;
 use WWW::OpenAPIClient::Object::HealthCheckResult;
-use WWW::OpenAPIClient::Object::InlineObject;
-use WWW::OpenAPIClient::Object::InlineObject1;
-use WWW::OpenAPIClient::Object::InlineObject2;
-use WWW::OpenAPIClient::Object::InlineObject3;
-use WWW::OpenAPIClient::Object::InlineObject4;
-use WWW::OpenAPIClient::Object::InlineObject5;
 use WWW::OpenAPIClient::Object::InlineResponseDefault;
 use WWW::OpenAPIClient::Object::List;
 use WWW::OpenAPIClient::Object::MapTest;
@@ -442,12 +430,6 @@ Class | Method | HTTP request | Description
  - [WWW::OpenAPIClient::Object::FormatTest](docs/FormatTest.md)
  - [WWW::OpenAPIClient::Object::HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [WWW::OpenAPIClient::Object::HealthCheckResult](docs/HealthCheckResult.md)
- - [WWW::OpenAPIClient::Object::InlineObject](docs/InlineObject.md)
- - [WWW::OpenAPIClient::Object::InlineObject1](docs/InlineObject1.md)
- - [WWW::OpenAPIClient::Object::InlineObject2](docs/InlineObject2.md)
- - [WWW::OpenAPIClient::Object::InlineObject3](docs/InlineObject3.md)
- - [WWW::OpenAPIClient::Object::InlineObject4](docs/InlineObject4.md)
- - [WWW::OpenAPIClient::Object::InlineObject5](docs/InlineObject5.md)
  - [WWW::OpenAPIClient::Object::InlineResponseDefault](docs/InlineResponseDefault.md)
  - [WWW::OpenAPIClient::Object::List](docs/List.md)
  - [WWW::OpenAPIClient::Object::MapTest](docs/MapTest.md)
diff --git a/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/FILES b/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/FILES
index 6c0c0f87b52..dc5379a47ec 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/FILES
+++ b/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/FILES
@@ -33,12 +33,6 @@ docs/Model/Foo.md
 docs/Model/FormatTest.md
 docs/Model/HasOnlyReadOnly.md
 docs/Model/HealthCheckResult.md
-docs/Model/InlineObject.md
-docs/Model/InlineObject1.md
-docs/Model/InlineObject2.md
-docs/Model/InlineObject3.md
-docs/Model/InlineObject4.md
-docs/Model/InlineObject5.md
 docs/Model/InlineResponseDefault.md
 docs/Model/MapTest.md
 docs/Model/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -93,12 +87,6 @@ lib/Model/Foo.php
 lib/Model/FormatTest.php
 lib/Model/HasOnlyReadOnly.php
 lib/Model/HealthCheckResult.php
-lib/Model/InlineObject.php
-lib/Model/InlineObject1.php
-lib/Model/InlineObject2.php
-lib/Model/InlineObject3.php
-lib/Model/InlineObject4.php
-lib/Model/InlineObject5.php
 lib/Model/InlineResponseDefault.php
 lib/Model/MapTest.php
 lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
diff --git a/samples/client/petstore/php/OpenAPIClient-php/README.md b/samples/client/petstore/php/OpenAPIClient-php/README.md
index d4c381a27c0..88a572629bb 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/README.md
+++ b/samples/client/petstore/php/OpenAPIClient-php/README.md
@@ -136,12 +136,6 @@ Class | Method | HTTP request | Description
 - [FormatTest](docs/Model/FormatTest.md)
 - [HasOnlyReadOnly](docs/Model/HasOnlyReadOnly.md)
 - [HealthCheckResult](docs/Model/HealthCheckResult.md)
-- [InlineObject](docs/Model/InlineObject.md)
-- [InlineObject1](docs/Model/InlineObject1.md)
-- [InlineObject2](docs/Model/InlineObject2.md)
-- [InlineObject3](docs/Model/InlineObject3.md)
-- [InlineObject4](docs/Model/InlineObject4.md)
-- [InlineObject5](docs/Model/InlineObject5.md)
 - [InlineResponseDefault](docs/Model/InlineResponseDefault.md)
 - [MapTest](docs/Model/MapTest.md)
 - [MixedPropertiesAndAdditionalPropertiesClass](docs/Model/MixedPropertiesAndAdditionalPropertiesClass.md)
diff --git a/samples/client/petstore/powershell/.openapi-generator/FILES b/samples/client/petstore/powershell/.openapi-generator/FILES
index 4708e0914a5..5f8aa4fd57d 100644
--- a/samples/client/petstore/powershell/.openapi-generator/FILES
+++ b/samples/client/petstore/powershell/.openapi-generator/FILES
@@ -3,8 +3,6 @@ README.md
 appveyor.yml
 docs/ApiResponse.md
 docs/Category.md
-docs/InlineObject.md
-docs/InlineObject1.md
 docs/Order.md
 docs/PSPetApi.md
 docs/PSStoreApi.md
@@ -18,8 +16,6 @@ src/PSPetstore/Api/PSUserApi.ps1
 src/PSPetstore/Client/PSConfiguration.ps1
 src/PSPetstore/Model/ApiResponse.ps1
 src/PSPetstore/Model/Category.ps1
-src/PSPetstore/Model/InlineObject.ps1
-src/PSPetstore/Model/InlineObject1.ps1
 src/PSPetstore/Model/Order.ps1
 src/PSPetstore/Model/Pet.ps1
 src/PSPetstore/Model/Tag.ps1
diff --git a/samples/client/petstore/powershell/README.md b/samples/client/petstore/powershell/README.md
index 837757ddd88..d394a82a0e9 100644
--- a/samples/client/petstore/powershell/README.md
+++ b/samples/client/petstore/powershell/README.md
@@ -81,8 +81,6 @@ Class | Method | HTTP request | Description
 
  - [PSPetstore/Model.ApiResponse](docs/ApiResponse.md)
  - [PSPetstore/Model.Category](docs/Category.md)
- - [PSPetstore/Model.InlineObject](docs/InlineObject.md)
- - [PSPetstore/Model.InlineObject1](docs/InlineObject1.md)
  - [PSPetstore/Model.Order](docs/Order.md)
  - [PSPetstore/Model.Pet](docs/Pet.md)
  - [PSPetstore/Model.Tag](docs/Tag.md)
diff --git a/samples/client/petstore/ruby-faraday/.openapi-generator/FILES b/samples/client/petstore/ruby-faraday/.openapi-generator/FILES
index dff9045f9ba..e6cc5300c83 100644
--- a/samples/client/petstore/ruby-faraday/.openapi-generator/FILES
+++ b/samples/client/petstore/ruby-faraday/.openapi-generator/FILES
@@ -32,12 +32,6 @@ docs/Foo.md
 docs/FormatTest.md
 docs/HasOnlyReadOnly.md
 docs/HealthCheckResult.md
-docs/InlineObject.md
-docs/InlineObject1.md
-docs/InlineObject2.md
-docs/InlineObject3.md
-docs/InlineObject4.md
-docs/InlineObject5.md
 docs/InlineResponseDefault.md
 docs/List.md
 docs/MapTest.md
@@ -97,12 +91,6 @@ lib/petstore/models/foo.rb
 lib/petstore/models/format_test.rb
 lib/petstore/models/has_only_read_only.rb
 lib/petstore/models/health_check_result.rb
-lib/petstore/models/inline_object.rb
-lib/petstore/models/inline_object1.rb
-lib/petstore/models/inline_object2.rb
-lib/petstore/models/inline_object3.rb
-lib/petstore/models/inline_object4.rb
-lib/petstore/models/inline_object5.rb
 lib/petstore/models/inline_response_default.rb
 lib/petstore/models/list.rb
 lib/petstore/models/map_test.rb
diff --git a/samples/client/petstore/ruby-faraday/README.md b/samples/client/petstore/ruby-faraday/README.md
index 719039e5311..35c76f3817e 100644
--- a/samples/client/petstore/ruby-faraday/README.md
+++ b/samples/client/petstore/ruby-faraday/README.md
@@ -141,12 +141,6 @@ Class | Method | HTTP request | Description
  - [Petstore::FormatTest](docs/FormatTest.md)
  - [Petstore::HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [Petstore::HealthCheckResult](docs/HealthCheckResult.md)
- - [Petstore::InlineObject](docs/InlineObject.md)
- - [Petstore::InlineObject1](docs/InlineObject1.md)
- - [Petstore::InlineObject2](docs/InlineObject2.md)
- - [Petstore::InlineObject3](docs/InlineObject3.md)
- - [Petstore::InlineObject4](docs/InlineObject4.md)
- - [Petstore::InlineObject5](docs/InlineObject5.md)
  - [Petstore::InlineResponseDefault](docs/InlineResponseDefault.md)
  - [Petstore::List](docs/List.md)
  - [Petstore::MapTest](docs/MapTest.md)
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore.rb b/samples/client/petstore/ruby-faraday/lib/petstore.rb
index 7f8ae56e123..f0df2170db0 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore.rb
@@ -40,12 +40,6 @@ require 'petstore/models/foo'
 require 'petstore/models/format_test'
 require 'petstore/models/has_only_read_only'
 require 'petstore/models/health_check_result'
-require 'petstore/models/inline_object'
-require 'petstore/models/inline_object1'
-require 'petstore/models/inline_object2'
-require 'petstore/models/inline_object3'
-require 'petstore/models/inline_object4'
-require 'petstore/models/inline_object5'
 require 'petstore/models/inline_response_default'
 require 'petstore/models/list'
 require 'petstore/models/map_test'
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/inline_object.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/inline_object.rb
deleted file mode 100644
index ab30d0a7cdb..00000000000
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/inline_object.rb
+++ /dev/null
@@ -1,229 +0,0 @@
-=begin
-#OpenAPI Petstore
-
-#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-The version of the OpenAPI document: 1.0.0
-
-Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.0.0-SNAPSHOT
-
-=end
-
-require 'date'
-require 'time'
-
-module Petstore
-  class InlineObject
-    # Updated name of the pet
-    attr_accessor :name
-
-    # Updated status of the pet
-    attr_accessor :status
-
-    # Attribute mapping from ruby-style variable name to JSON key.
-    def self.attribute_map
-      {
-        :'name' => :'name',
-        :'status' => :'status'
-      }
-    end
-
-    # Returns all the JSON keys this model knows about
-    def self.acceptable_attributes
-      attribute_map.values
-    end
-
-    # Attribute type mapping.
-    def self.openapi_types
-      {
-        :'name' => :'String',
-        :'status' => :'String'
-      }
-    end
-
-    # List of attributes with nullable: true
-    def self.openapi_nullable
-      Set.new([
-      ])
-    end
-
-    # Initializes the object
-    # @param [Hash] attributes Model attributes in the form of hash
-    def initialize(attributes = {})
-      if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `Petstore::InlineObject` initialize method"
-      end
-
-      # check to see if the attribute exists and convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h|
-        if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `Petstore::InlineObject`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
-        end
-        h[k.to_sym] = v
-      }
-
-      if attributes.key?(:'name')
-        self.name = attributes[:'name']
-      end
-
-      if attributes.key?(:'status')
-        self.status = attributes[:'status']
-      end
-    end
-
-    # Show invalid properties with the reasons. Usually used together with valid?
-    # @return Array for valid properties with the reasons
-    def list_invalid_properties
-      invalid_properties = Array.new
-      invalid_properties
-    end
-
-    # Check to see if the all the properties in the model are valid
-    # @return true if the model is valid
-    def valid?
-      true
-    end
-
-    # Checks equality by comparing each attribute.
-    # @param [Object] Object to be compared
-    def ==(o)
-      return true if self.equal?(o)
-      self.class == o.class &&
-          name == o.name &&
-          status == o.status
-    end
-
-    # @see the `==` method
-    # @param [Object] Object to be compared
-    def eql?(o)
-      self == o
-    end
-
-    # Calculates hash code according to all attributes.
-    # @return [Integer] Hash code
-    def hash
-      [name, status].hash
-    end
-
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @return [Object] Returns the model itself
-    def self.build_from_hash(attributes)
-      new.build_from_hash(attributes)
-    end
-
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @return [Object] Returns the model itself
-    def build_from_hash(attributes)
-      return nil unless attributes.is_a?(Hash)
-      self.class.openapi_types.each_pair do |key, type|
-        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
-        elsif type =~ /\AArray<(.*)>/i
-          # check to ensure the input is an array given that the attribute
-          # is documented as an array but the input is not
-          if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
-          end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end
-      end
-
-      self
-    end
-
-    # Deserializes the data based on type
-    # @param string type Data type
-    # @param string value Value to be deserialized
-    # @return [Object] Deserialized data
-    def _deserialize(type, value)
-      case type.to_sym
-      when :Time
-        Time.parse(value)
-      when :Date
-        Date.parse(value)
-      when :String
-        value.to_s
-      when :Integer
-        value.to_i
-      when :Float
-        value.to_f
-      when :Boolean
-        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
-          true
-        else
-          false
-        end
-      when :Object
-        # generic object (usually a Hash), return directly
-        value
-      when /\AArray<(?<inner_type>.+)>\z/
-        inner_type = Regexp.last_match[:inner_type]
-        value.map { |v| _deserialize(inner_type, v) }
-      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
-        k_type = Regexp.last_match[:k_type]
-        v_type = Regexp.last_match[:v_type]
-        {}.tap do |hash|
-          value.each do |k, v|
-            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
-          end
-        end
-      else # model
-        # models (e.g. Pet) or oneOf
-        klass = Petstore.const_get(type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
-      end
-    end
-
-    # Returns the string representation of the object
-    # @return [String] String presentation of the object
-    def to_s
-      to_hash.to_s
-    end
-
-    # to_body is an alias to to_hash (backward compatibility)
-    # @return [Hash] Returns the object in the form of hash
-    def to_body
-      to_hash
-    end
-
-    # Returns the object in the form of hash
-    # @return [Hash] Returns the object in the form of hash
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      hash
-    end
-
-    # Outputs non-array value in the form of hash
-    # For object, use to_hash. Otherwise, just return the value
-    # @param [Object] value Any valid value
-    # @return [Hash] Returns the value in the form of hash
-    def _to_hash(value)
-      if value.is_a?(Array)
-        value.compact.map { |v| _to_hash(v) }
-      elsif value.is_a?(Hash)
-        {}.tap do |hash|
-          value.each { |k, v| hash[k] = _to_hash(v) }
-        end
-      elsif value.respond_to? :to_hash
-        value.to_hash
-      else
-        value
-      end
-    end
-
-  end
-
-end
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/inline_object1.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/inline_object1.rb
deleted file mode 100644
index 7fda668343d..00000000000
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/inline_object1.rb
+++ /dev/null
@@ -1,229 +0,0 @@
-=begin
-#OpenAPI Petstore
-
-#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-The version of the OpenAPI document: 1.0.0
-
-Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.0.0-SNAPSHOT
-
-=end
-
-require 'date'
-require 'time'
-
-module Petstore
-  class InlineObject1
-    # Additional data to pass to server
-    attr_accessor :additional_metadata
-
-    # file to upload
-    attr_accessor :file
-
-    # Attribute mapping from ruby-style variable name to JSON key.
-    def self.attribute_map
-      {
-        :'additional_metadata' => :'additionalMetadata',
-        :'file' => :'file'
-      }
-    end
-
-    # Returns all the JSON keys this model knows about
-    def self.acceptable_attributes
-      attribute_map.values
-    end
-
-    # Attribute type mapping.
-    def self.openapi_types
-      {
-        :'additional_metadata' => :'String',
-        :'file' => :'File'
-      }
-    end
-
-    # List of attributes with nullable: true
-    def self.openapi_nullable
-      Set.new([
-      ])
-    end
-
-    # Initializes the object
-    # @param [Hash] attributes Model attributes in the form of hash
-    def initialize(attributes = {})
-      if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `Petstore::InlineObject1` initialize method"
-      end
-
-      # check to see if the attribute exists and convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h|
-        if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `Petstore::InlineObject1`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
-        end
-        h[k.to_sym] = v
-      }
-
-      if attributes.key?(:'additional_metadata')
-        self.additional_metadata = attributes[:'additional_metadata']
-      end
-
-      if attributes.key?(:'file')
-        self.file = attributes[:'file']
-      end
-    end
-
-    # Show invalid properties with the reasons. Usually used together with valid?
-    # @return Array for valid properties with the reasons
-    def list_invalid_properties
-      invalid_properties = Array.new
-      invalid_properties
-    end
-
-    # Check to see if the all the properties in the model are valid
-    # @return true if the model is valid
-    def valid?
-      true
-    end
-
-    # Checks equality by comparing each attribute.
-    # @param [Object] Object to be compared
-    def ==(o)
-      return true if self.equal?(o)
-      self.class == o.class &&
-          additional_metadata == o.additional_metadata &&
-          file == o.file
-    end
-
-    # @see the `==` method
-    # @param [Object] Object to be compared
-    def eql?(o)
-      self == o
-    end
-
-    # Calculates hash code according to all attributes.
-    # @return [Integer] Hash code
-    def hash
-      [additional_metadata, file].hash
-    end
-
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @return [Object] Returns the model itself
-    def self.build_from_hash(attributes)
-      new.build_from_hash(attributes)
-    end
-
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @return [Object] Returns the model itself
-    def build_from_hash(attributes)
-      return nil unless attributes.is_a?(Hash)
-      self.class.openapi_types.each_pair do |key, type|
-        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
-        elsif type =~ /\AArray<(.*)>/i
-          # check to ensure the input is an array given that the attribute
-          # is documented as an array but the input is not
-          if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
-          end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end
-      end
-
-      self
-    end
-
-    # Deserializes the data based on type
-    # @param string type Data type
-    # @param string value Value to be deserialized
-    # @return [Object] Deserialized data
-    def _deserialize(type, value)
-      case type.to_sym
-      when :Time
-        Time.parse(value)
-      when :Date
-        Date.parse(value)
-      when :String
-        value.to_s
-      when :Integer
-        value.to_i
-      when :Float
-        value.to_f
-      when :Boolean
-        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
-          true
-        else
-          false
-        end
-      when :Object
-        # generic object (usually a Hash), return directly
-        value
-      when /\AArray<(?<inner_type>.+)>\z/
-        inner_type = Regexp.last_match[:inner_type]
-        value.map { |v| _deserialize(inner_type, v) }
-      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
-        k_type = Regexp.last_match[:k_type]
-        v_type = Regexp.last_match[:v_type]
-        {}.tap do |hash|
-          value.each do |k, v|
-            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
-          end
-        end
-      else # model
-        # models (e.g. Pet) or oneOf
-        klass = Petstore.const_get(type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
-      end
-    end
-
-    # Returns the string representation of the object
-    # @return [String] String presentation of the object
-    def to_s
-      to_hash.to_s
-    end
-
-    # to_body is an alias to to_hash (backward compatibility)
-    # @return [Hash] Returns the object in the form of hash
-    def to_body
-      to_hash
-    end
-
-    # Returns the object in the form of hash
-    # @return [Hash] Returns the object in the form of hash
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      hash
-    end
-
-    # Outputs non-array value in the form of hash
-    # For object, use to_hash. Otherwise, just return the value
-    # @param [Object] value Any valid value
-    # @return [Hash] Returns the value in the form of hash
-    def _to_hash(value)
-      if value.is_a?(Array)
-        value.compact.map { |v| _to_hash(v) }
-      elsif value.is_a?(Hash)
-        {}.tap do |hash|
-          value.each { |k, v| hash[k] = _to_hash(v) }
-        end
-      elsif value.respond_to? :to_hash
-        value.to_hash
-      else
-        value
-      end
-    end
-
-  end
-
-end
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/inline_object2.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/inline_object2.rb
deleted file mode 100644
index 4218ff5c090..00000000000
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/inline_object2.rb
+++ /dev/null
@@ -1,267 +0,0 @@
-=begin
-#OpenAPI Petstore
-
-#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-The version of the OpenAPI document: 1.0.0
-
-Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.0.0-SNAPSHOT
-
-=end
-
-require 'date'
-require 'time'
-
-module Petstore
-  class InlineObject2
-    # Form parameter enum test (string array)
-    attr_accessor :enum_form_string_array
-
-    # Form parameter enum test (string)
-    attr_accessor :enum_form_string
-
-    class EnumAttributeValidator
-      attr_reader :datatype
-      attr_reader :allowable_values
-
-      def initialize(datatype, allowable_values)
-        @allowable_values = allowable_values.map do |value|
-          case datatype.to_s
-          when /Integer/i
-            value.to_i
-          when /Float/i
-            value.to_f
-          else
-            value
-          end
-        end
-      end
-
-      def valid?(value)
-        !value || allowable_values.include?(value)
-      end
-    end
-
-    # Attribute mapping from ruby-style variable name to JSON key.
-    def self.attribute_map
-      {
-        :'enum_form_string_array' => :'enum_form_string_array',
-        :'enum_form_string' => :'enum_form_string'
-      }
-    end
-
-    # Returns all the JSON keys this model knows about
-    def self.acceptable_attributes
-      attribute_map.values
-    end
-
-    # Attribute type mapping.
-    def self.openapi_types
-      {
-        :'enum_form_string_array' => :'Array<String>',
-        :'enum_form_string' => :'String'
-      }
-    end
-
-    # List of attributes with nullable: true
-    def self.openapi_nullable
-      Set.new([
-      ])
-    end
-
-    # Initializes the object
-    # @param [Hash] attributes Model attributes in the form of hash
-    def initialize(attributes = {})
-      if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `Petstore::InlineObject2` initialize method"
-      end
-
-      # check to see if the attribute exists and convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h|
-        if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `Petstore::InlineObject2`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
-        end
-        h[k.to_sym] = v
-      }
-
-      if attributes.key?(:'enum_form_string_array')
-        if (value = attributes[:'enum_form_string_array']).is_a?(Array)
-          self.enum_form_string_array = value
-        end
-      end
-
-      if attributes.key?(:'enum_form_string')
-        self.enum_form_string = attributes[:'enum_form_string']
-      else
-        self.enum_form_string = '-efg'
-      end
-    end
-
-    # Show invalid properties with the reasons. Usually used together with valid?
-    # @return Array for valid properties with the reasons
-    def list_invalid_properties
-      invalid_properties = Array.new
-      invalid_properties
-    end
-
-    # Check to see if the all the properties in the model are valid
-    # @return true if the model is valid
-    def valid?
-      enum_form_string_validator = EnumAttributeValidator.new('String', ["_abc", "-efg", "(xyz)"])
-      return false unless enum_form_string_validator.valid?(@enum_form_string)
-      true
-    end
-
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] enum_form_string Object to be assigned
-    def enum_form_string=(enum_form_string)
-      validator = EnumAttributeValidator.new('String', ["_abc", "-efg", "(xyz)"])
-      unless validator.valid?(enum_form_string)
-        fail ArgumentError, "invalid value for \"enum_form_string\", must be one of #{validator.allowable_values}."
-      end
-      @enum_form_string = enum_form_string
-    end
-
-    # Checks equality by comparing each attribute.
-    # @param [Object] Object to be compared
-    def ==(o)
-      return true if self.equal?(o)
-      self.class == o.class &&
-          enum_form_string_array == o.enum_form_string_array &&
-          enum_form_string == o.enum_form_string
-    end
-
-    # @see the `==` method
-    # @param [Object] Object to be compared
-    def eql?(o)
-      self == o
-    end
-
-    # Calculates hash code according to all attributes.
-    # @return [Integer] Hash code
-    def hash
-      [enum_form_string_array, enum_form_string].hash
-    end
-
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @return [Object] Returns the model itself
-    def self.build_from_hash(attributes)
-      new.build_from_hash(attributes)
-    end
-
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @return [Object] Returns the model itself
-    def build_from_hash(attributes)
-      return nil unless attributes.is_a?(Hash)
-      self.class.openapi_types.each_pair do |key, type|
-        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
-        elsif type =~ /\AArray<(.*)>/i
-          # check to ensure the input is an array given that the attribute
-          # is documented as an array but the input is not
-          if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
-          end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end
-      end
-
-      self
-    end
-
-    # Deserializes the data based on type
-    # @param string type Data type
-    # @param string value Value to be deserialized
-    # @return [Object] Deserialized data
-    def _deserialize(type, value)
-      case type.to_sym
-      when :Time
-        Time.parse(value)
-      when :Date
-        Date.parse(value)
-      when :String
-        value.to_s
-      when :Integer
-        value.to_i
-      when :Float
-        value.to_f
-      when :Boolean
-        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
-          true
-        else
-          false
-        end
-      when :Object
-        # generic object (usually a Hash), return directly
-        value
-      when /\AArray<(?<inner_type>.+)>\z/
-        inner_type = Regexp.last_match[:inner_type]
-        value.map { |v| _deserialize(inner_type, v) }
-      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
-        k_type = Regexp.last_match[:k_type]
-        v_type = Regexp.last_match[:v_type]
-        {}.tap do |hash|
-          value.each do |k, v|
-            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
-          end
-        end
-      else # model
-        # models (e.g. Pet) or oneOf
-        klass = Petstore.const_get(type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
-      end
-    end
-
-    # Returns the string representation of the object
-    # @return [String] String presentation of the object
-    def to_s
-      to_hash.to_s
-    end
-
-    # to_body is an alias to to_hash (backward compatibility)
-    # @return [Hash] Returns the object in the form of hash
-    def to_body
-      to_hash
-    end
-
-    # Returns the object in the form of hash
-    # @return [Hash] Returns the object in the form of hash
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      hash
-    end
-
-    # Outputs non-array value in the form of hash
-    # For object, use to_hash. Otherwise, just return the value
-    # @param [Object] value Any valid value
-    # @return [Hash] Returns the value in the form of hash
-    def _to_hash(value)
-      if value.is_a?(Array)
-        value.compact.map { |v| _to_hash(v) }
-      elsif value.is_a?(Hash)
-        {}.tap do |hash|
-          value.each { |k, v| hash[k] = _to_hash(v) }
-        end
-      elsif value.respond_to? :to_hash
-        value.to_hash
-      else
-        value
-      end
-    end
-
-  end
-
-end
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/inline_object3.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/inline_object3.rb
deleted file mode 100644
index fef4fac9195..00000000000
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/inline_object3.rb
+++ /dev/null
@@ -1,550 +0,0 @@
-=begin
-#OpenAPI Petstore
-
-#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-The version of the OpenAPI document: 1.0.0
-
-Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.0.0-SNAPSHOT
-
-=end
-
-require 'date'
-require 'time'
-
-module Petstore
-  class InlineObject3
-    # None
-    attr_accessor :integer
-
-    # None
-    attr_accessor :int32
-
-    # None
-    attr_accessor :int64
-
-    # None
-    attr_accessor :number
-
-    # None
-    attr_accessor :float
-
-    # None
-    attr_accessor :double
-
-    # None
-    attr_accessor :string
-
-    # None
-    attr_accessor :pattern_without_delimiter
-
-    # None
-    attr_accessor :byte
-
-    # None
-    attr_accessor :binary
-
-    # None
-    attr_accessor :date
-
-    # None
-    attr_accessor :date_time
-
-    # None
-    attr_accessor :password
-
-    # None
-    attr_accessor :callback
-
-    # Attribute mapping from ruby-style variable name to JSON key.
-    def self.attribute_map
-      {
-        :'integer' => :'integer',
-        :'int32' => :'int32',
-        :'int64' => :'int64',
-        :'number' => :'number',
-        :'float' => :'float',
-        :'double' => :'double',
-        :'string' => :'string',
-        :'pattern_without_delimiter' => :'pattern_without_delimiter',
-        :'byte' => :'byte',
-        :'binary' => :'binary',
-        :'date' => :'date',
-        :'date_time' => :'dateTime',
-        :'password' => :'password',
-        :'callback' => :'callback'
-      }
-    end
-
-    # Returns all the JSON keys this model knows about
-    def self.acceptable_attributes
-      attribute_map.values
-    end
-
-    # Attribute type mapping.
-    def self.openapi_types
-      {
-        :'integer' => :'Integer',
-        :'int32' => :'Integer',
-        :'int64' => :'Integer',
-        :'number' => :'Float',
-        :'float' => :'Float',
-        :'double' => :'Float',
-        :'string' => :'String',
-        :'pattern_without_delimiter' => :'String',
-        :'byte' => :'String',
-        :'binary' => :'File',
-        :'date' => :'Date',
-        :'date_time' => :'Time',
-        :'password' => :'String',
-        :'callback' => :'String'
-      }
-    end
-
-    # List of attributes with nullable: true
-    def self.openapi_nullable
-      Set.new([
-      ])
-    end
-
-    # Initializes the object
-    # @param [Hash] attributes Model attributes in the form of hash
-    def initialize(attributes = {})
-      if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `Petstore::InlineObject3` initialize method"
-      end
-
-      # check to see if the attribute exists and convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h|
-        if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `Petstore::InlineObject3`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
-        end
-        h[k.to_sym] = v
-      }
-
-      if attributes.key?(:'integer')
-        self.integer = attributes[:'integer']
-      end
-
-      if attributes.key?(:'int32')
-        self.int32 = attributes[:'int32']
-      end
-
-      if attributes.key?(:'int64')
-        self.int64 = attributes[:'int64']
-      end
-
-      if attributes.key?(:'number')
-        self.number = attributes[:'number']
-      end
-
-      if attributes.key?(:'float')
-        self.float = attributes[:'float']
-      end
-
-      if attributes.key?(:'double')
-        self.double = attributes[:'double']
-      end
-
-      if attributes.key?(:'string')
-        self.string = attributes[:'string']
-      end
-
-      if attributes.key?(:'pattern_without_delimiter')
-        self.pattern_without_delimiter = attributes[:'pattern_without_delimiter']
-      end
-
-      if attributes.key?(:'byte')
-        self.byte = attributes[:'byte']
-      end
-
-      if attributes.key?(:'binary')
-        self.binary = attributes[:'binary']
-      end
-
-      if attributes.key?(:'date')
-        self.date = attributes[:'date']
-      end
-
-      if attributes.key?(:'date_time')
-        self.date_time = attributes[:'date_time']
-      end
-
-      if attributes.key?(:'password')
-        self.password = attributes[:'password']
-      end
-
-      if attributes.key?(:'callback')
-        self.callback = attributes[:'callback']
-      end
-    end
-
-    # Show invalid properties with the reasons. Usually used together with valid?
-    # @return Array for valid properties with the reasons
-    def list_invalid_properties
-      invalid_properties = Array.new
-      if !@integer.nil? && @integer > 100
-        invalid_properties.push('invalid value for "integer", must be smaller than or equal to 100.')
-      end
-
-      if !@integer.nil? && @integer < 10
-        invalid_properties.push('invalid value for "integer", must be greater than or equal to 10.')
-      end
-
-      if !@int32.nil? && @int32 > 200
-        invalid_properties.push('invalid value for "int32", must be smaller than or equal to 200.')
-      end
-
-      if !@int32.nil? && @int32 < 20
-        invalid_properties.push('invalid value for "int32", must be greater than or equal to 20.')
-      end
-
-      if @number.nil?
-        invalid_properties.push('invalid value for "number", number cannot be nil.')
-      end
-
-      if @number > 543.2
-        invalid_properties.push('invalid value for "number", must be smaller than or equal to 543.2.')
-      end
-
-      if @number < 32.1
-        invalid_properties.push('invalid value for "number", must be greater than or equal to 32.1.')
-      end
-
-      if !@float.nil? && @float > 987.6
-        invalid_properties.push('invalid value for "float", must be smaller than or equal to 987.6.')
-      end
-
-      if @double.nil?
-        invalid_properties.push('invalid value for "double", double cannot be nil.')
-      end
-
-      if @double > 123.4
-        invalid_properties.push('invalid value for "double", must be smaller than or equal to 123.4.')
-      end
-
-      if @double < 67.8
-        invalid_properties.push('invalid value for "double", must be greater than or equal to 67.8.')
-      end
-
-      pattern = Regexp.new(/[a-z]/i)
-      if !@string.nil? && @string !~ pattern
-        invalid_properties.push("invalid value for \"string\", must conform to the pattern #{pattern}.")
-      end
-
-      if @pattern_without_delimiter.nil?
-        invalid_properties.push('invalid value for "pattern_without_delimiter", pattern_without_delimiter cannot be nil.')
-      end
-
-      pattern = Regexp.new(/^[A-Z].*/)
-      if @pattern_without_delimiter !~ pattern
-        invalid_properties.push("invalid value for \"pattern_without_delimiter\", must conform to the pattern #{pattern}.")
-      end
-
-      if @byte.nil?
-        invalid_properties.push('invalid value for "byte", byte cannot be nil.')
-      end
-
-      if !@password.nil? && @password.to_s.length > 64
-        invalid_properties.push('invalid value for "password", the character length must be smaller than or equal to 64.')
-      end
-
-      if !@password.nil? && @password.to_s.length < 10
-        invalid_properties.push('invalid value for "password", the character length must be great than or equal to 10.')
-      end
-
-      invalid_properties
-    end
-
-    # Check to see if the all the properties in the model are valid
-    # @return true if the model is valid
-    def valid?
-      return false if !@integer.nil? && @integer > 100
-      return false if !@integer.nil? && @integer < 10
-      return false if !@int32.nil? && @int32 > 200
-      return false if !@int32.nil? && @int32 < 20
-      return false if @number.nil?
-      return false if @number > 543.2
-      return false if @number < 32.1
-      return false if !@float.nil? && @float > 987.6
-      return false if @double.nil?
-      return false if @double > 123.4
-      return false if @double < 67.8
-      return false if !@string.nil? && @string !~ Regexp.new(/[a-z]/i)
-      return false if @pattern_without_delimiter.nil?
-      return false if @pattern_without_delimiter !~ Regexp.new(/^[A-Z].*/)
-      return false if @byte.nil?
-      return false if !@password.nil? && @password.to_s.length > 64
-      return false if !@password.nil? && @password.to_s.length < 10
-      true
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] integer Value to be assigned
-    def integer=(integer)
-      if !integer.nil? && integer > 100
-        fail ArgumentError, 'invalid value for "integer", must be smaller than or equal to 100.'
-      end
-
-      if !integer.nil? && integer < 10
-        fail ArgumentError, 'invalid value for "integer", must be greater than or equal to 10.'
-      end
-
-      @integer = integer
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] int32 Value to be assigned
-    def int32=(int32)
-      if !int32.nil? && int32 > 200
-        fail ArgumentError, 'invalid value for "int32", must be smaller than or equal to 200.'
-      end
-
-      if !int32.nil? && int32 < 20
-        fail ArgumentError, 'invalid value for "int32", must be greater than or equal to 20.'
-      end
-
-      @int32 = int32
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] number Value to be assigned
-    def number=(number)
-      if number.nil?
-        fail ArgumentError, 'number cannot be nil'
-      end
-
-      if number > 543.2
-        fail ArgumentError, 'invalid value for "number", must be smaller than or equal to 543.2.'
-      end
-
-      if number < 32.1
-        fail ArgumentError, 'invalid value for "number", must be greater than or equal to 32.1.'
-      end
-
-      @number = number
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] float Value to be assigned
-    def float=(float)
-      if !float.nil? && float > 987.6
-        fail ArgumentError, 'invalid value for "float", must be smaller than or equal to 987.6.'
-      end
-
-      @float = float
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] double Value to be assigned
-    def double=(double)
-      if double.nil?
-        fail ArgumentError, 'double cannot be nil'
-      end
-
-      if double > 123.4
-        fail ArgumentError, 'invalid value for "double", must be smaller than or equal to 123.4.'
-      end
-
-      if double < 67.8
-        fail ArgumentError, 'invalid value for "double", must be greater than or equal to 67.8.'
-      end
-
-      @double = double
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] string Value to be assigned
-    def string=(string)
-      pattern = Regexp.new(/[a-z]/i)
-      if !string.nil? && string !~ pattern
-        fail ArgumentError, "invalid value for \"string\", must conform to the pattern #{pattern}."
-      end
-
-      @string = string
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] pattern_without_delimiter Value to be assigned
-    def pattern_without_delimiter=(pattern_without_delimiter)
-      if pattern_without_delimiter.nil?
-        fail ArgumentError, 'pattern_without_delimiter cannot be nil'
-      end
-
-      pattern = Regexp.new(/^[A-Z].*/)
-      if pattern_without_delimiter !~ pattern
-        fail ArgumentError, "invalid value for \"pattern_without_delimiter\", must conform to the pattern #{pattern}."
-      end
-
-      @pattern_without_delimiter = pattern_without_delimiter
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] password Value to be assigned
-    def password=(password)
-      if !password.nil? && password.to_s.length > 64
-        fail ArgumentError, 'invalid value for "password", the character length must be smaller than or equal to 64.'
-      end
-
-      if !password.nil? && password.to_s.length < 10
-        fail ArgumentError, 'invalid value for "password", the character length must be great than or equal to 10.'
-      end
-
-      @password = password
-    end
-
-    # Checks equality by comparing each attribute.
-    # @param [Object] Object to be compared
-    def ==(o)
-      return true if self.equal?(o)
-      self.class == o.class &&
-          integer == o.integer &&
-          int32 == o.int32 &&
-          int64 == o.int64 &&
-          number == o.number &&
-          float == o.float &&
-          double == o.double &&
-          string == o.string &&
-          pattern_without_delimiter == o.pattern_without_delimiter &&
-          byte == o.byte &&
-          binary == o.binary &&
-          date == o.date &&
-          date_time == o.date_time &&
-          password == o.password &&
-          callback == o.callback
-    end
-
-    # @see the `==` method
-    # @param [Object] Object to be compared
-    def eql?(o)
-      self == o
-    end
-
-    # Calculates hash code according to all attributes.
-    # @return [Integer] Hash code
-    def hash
-      [integer, int32, int64, number, float, double, string, pattern_without_delimiter, byte, binary, date, date_time, password, callback].hash
-    end
-
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @return [Object] Returns the model itself
-    def self.build_from_hash(attributes)
-      new.build_from_hash(attributes)
-    end
-
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @return [Object] Returns the model itself
-    def build_from_hash(attributes)
-      return nil unless attributes.is_a?(Hash)
-      self.class.openapi_types.each_pair do |key, type|
-        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
-        elsif type =~ /\AArray<(.*)>/i
-          # check to ensure the input is an array given that the attribute
-          # is documented as an array but the input is not
-          if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
-          end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end
-      end
-
-      self
-    end
-
-    # Deserializes the data based on type
-    # @param string type Data type
-    # @param string value Value to be deserialized
-    # @return [Object] Deserialized data
-    def _deserialize(type, value)
-      case type.to_sym
-      when :Time
-        Time.parse(value)
-      when :Date
-        Date.parse(value)
-      when :String
-        value.to_s
-      when :Integer
-        value.to_i
-      when :Float
-        value.to_f
-      when :Boolean
-        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
-          true
-        else
-          false
-        end
-      when :Object
-        # generic object (usually a Hash), return directly
-        value
-      when /\AArray<(?<inner_type>.+)>\z/
-        inner_type = Regexp.last_match[:inner_type]
-        value.map { |v| _deserialize(inner_type, v) }
-      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
-        k_type = Regexp.last_match[:k_type]
-        v_type = Regexp.last_match[:v_type]
-        {}.tap do |hash|
-          value.each do |k, v|
-            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
-          end
-        end
-      else # model
-        # models (e.g. Pet) or oneOf
-        klass = Petstore.const_get(type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
-      end
-    end
-
-    # Returns the string representation of the object
-    # @return [String] String presentation of the object
-    def to_s
-      to_hash.to_s
-    end
-
-    # to_body is an alias to to_hash (backward compatibility)
-    # @return [Hash] Returns the object in the form of hash
-    def to_body
-      to_hash
-    end
-
-    # Returns the object in the form of hash
-    # @return [Hash] Returns the object in the form of hash
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      hash
-    end
-
-    # Outputs non-array value in the form of hash
-    # For object, use to_hash. Otherwise, just return the value
-    # @param [Object] value Any valid value
-    # @return [Hash] Returns the value in the form of hash
-    def _to_hash(value)
-      if value.is_a?(Array)
-        value.compact.map { |v| _to_hash(v) }
-      elsif value.is_a?(Hash)
-        {}.tap do |hash|
-          value.each { |k, v| hash[k] = _to_hash(v) }
-        end
-      elsif value.respond_to? :to_hash
-        value.to_hash
-      else
-        value
-      end
-    end
-
-  end
-
-end
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/inline_object4.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/inline_object4.rb
deleted file mode 100644
index cec629a7342..00000000000
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/inline_object4.rb
+++ /dev/null
@@ -1,239 +0,0 @@
-=begin
-#OpenAPI Petstore
-
-#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-The version of the OpenAPI document: 1.0.0
-
-Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.0.0-SNAPSHOT
-
-=end
-
-require 'date'
-require 'time'
-
-module Petstore
-  class InlineObject4
-    # field1
-    attr_accessor :param
-
-    # field2
-    attr_accessor :param2
-
-    # Attribute mapping from ruby-style variable name to JSON key.
-    def self.attribute_map
-      {
-        :'param' => :'param',
-        :'param2' => :'param2'
-      }
-    end
-
-    # Returns all the JSON keys this model knows about
-    def self.acceptable_attributes
-      attribute_map.values
-    end
-
-    # Attribute type mapping.
-    def self.openapi_types
-      {
-        :'param' => :'String',
-        :'param2' => :'String'
-      }
-    end
-
-    # List of attributes with nullable: true
-    def self.openapi_nullable
-      Set.new([
-      ])
-    end
-
-    # Initializes the object
-    # @param [Hash] attributes Model attributes in the form of hash
-    def initialize(attributes = {})
-      if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `Petstore::InlineObject4` initialize method"
-      end
-
-      # check to see if the attribute exists and convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h|
-        if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `Petstore::InlineObject4`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
-        end
-        h[k.to_sym] = v
-      }
-
-      if attributes.key?(:'param')
-        self.param = attributes[:'param']
-      end
-
-      if attributes.key?(:'param2')
-        self.param2 = attributes[:'param2']
-      end
-    end
-
-    # Show invalid properties with the reasons. Usually used together with valid?
-    # @return Array for valid properties with the reasons
-    def list_invalid_properties
-      invalid_properties = Array.new
-      if @param.nil?
-        invalid_properties.push('invalid value for "param", param cannot be nil.')
-      end
-
-      if @param2.nil?
-        invalid_properties.push('invalid value for "param2", param2 cannot be nil.')
-      end
-
-      invalid_properties
-    end
-
-    # Check to see if the all the properties in the model are valid
-    # @return true if the model is valid
-    def valid?
-      return false if @param.nil?
-      return false if @param2.nil?
-      true
-    end
-
-    # Checks equality by comparing each attribute.
-    # @param [Object] Object to be compared
-    def ==(o)
-      return true if self.equal?(o)
-      self.class == o.class &&
-          param == o.param &&
-          param2 == o.param2
-    end
-
-    # @see the `==` method
-    # @param [Object] Object to be compared
-    def eql?(o)
-      self == o
-    end
-
-    # Calculates hash code according to all attributes.
-    # @return [Integer] Hash code
-    def hash
-      [param, param2].hash
-    end
-
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @return [Object] Returns the model itself
-    def self.build_from_hash(attributes)
-      new.build_from_hash(attributes)
-    end
-
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @return [Object] Returns the model itself
-    def build_from_hash(attributes)
-      return nil unless attributes.is_a?(Hash)
-      self.class.openapi_types.each_pair do |key, type|
-        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
-        elsif type =~ /\AArray<(.*)>/i
-          # check to ensure the input is an array given that the attribute
-          # is documented as an array but the input is not
-          if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
-          end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end
-      end
-
-      self
-    end
-
-    # Deserializes the data based on type
-    # @param string type Data type
-    # @param string value Value to be deserialized
-    # @return [Object] Deserialized data
-    def _deserialize(type, value)
-      case type.to_sym
-      when :Time
-        Time.parse(value)
-      when :Date
-        Date.parse(value)
-      when :String
-        value.to_s
-      when :Integer
-        value.to_i
-      when :Float
-        value.to_f
-      when :Boolean
-        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
-          true
-        else
-          false
-        end
-      when :Object
-        # generic object (usually a Hash), return directly
-        value
-      when /\AArray<(?<inner_type>.+)>\z/
-        inner_type = Regexp.last_match[:inner_type]
-        value.map { |v| _deserialize(inner_type, v) }
-      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
-        k_type = Regexp.last_match[:k_type]
-        v_type = Regexp.last_match[:v_type]
-        {}.tap do |hash|
-          value.each do |k, v|
-            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
-          end
-        end
-      else # model
-        # models (e.g. Pet) or oneOf
-        klass = Petstore.const_get(type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
-      end
-    end
-
-    # Returns the string representation of the object
-    # @return [String] String presentation of the object
-    def to_s
-      to_hash.to_s
-    end
-
-    # to_body is an alias to to_hash (backward compatibility)
-    # @return [Hash] Returns the object in the form of hash
-    def to_body
-      to_hash
-    end
-
-    # Returns the object in the form of hash
-    # @return [Hash] Returns the object in the form of hash
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      hash
-    end
-
-    # Outputs non-array value in the form of hash
-    # For object, use to_hash. Otherwise, just return the value
-    # @param [Object] value Any valid value
-    # @return [Hash] Returns the value in the form of hash
-    def _to_hash(value)
-      if value.is_a?(Array)
-        value.compact.map { |v| _to_hash(v) }
-      elsif value.is_a?(Hash)
-        {}.tap do |hash|
-          value.each { |k, v| hash[k] = _to_hash(v) }
-        end
-      elsif value.respond_to? :to_hash
-        value.to_hash
-      else
-        value
-      end
-    end
-
-  end
-
-end
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/inline_object5.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/inline_object5.rb
deleted file mode 100644
index b6f800cb1be..00000000000
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/inline_object5.rb
+++ /dev/null
@@ -1,234 +0,0 @@
-=begin
-#OpenAPI Petstore
-
-#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-The version of the OpenAPI document: 1.0.0
-
-Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.0.0-SNAPSHOT
-
-=end
-
-require 'date'
-require 'time'
-
-module Petstore
-  class InlineObject5
-    # Additional data to pass to server
-    attr_accessor :additional_metadata
-
-    # file to upload
-    attr_accessor :required_file
-
-    # Attribute mapping from ruby-style variable name to JSON key.
-    def self.attribute_map
-      {
-        :'additional_metadata' => :'additionalMetadata',
-        :'required_file' => :'requiredFile'
-      }
-    end
-
-    # Returns all the JSON keys this model knows about
-    def self.acceptable_attributes
-      attribute_map.values
-    end
-
-    # Attribute type mapping.
-    def self.openapi_types
-      {
-        :'additional_metadata' => :'String',
-        :'required_file' => :'File'
-      }
-    end
-
-    # List of attributes with nullable: true
-    def self.openapi_nullable
-      Set.new([
-      ])
-    end
-
-    # Initializes the object
-    # @param [Hash] attributes Model attributes in the form of hash
-    def initialize(attributes = {})
-      if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `Petstore::InlineObject5` initialize method"
-      end
-
-      # check to see if the attribute exists and convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h|
-        if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `Petstore::InlineObject5`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
-        end
-        h[k.to_sym] = v
-      }
-
-      if attributes.key?(:'additional_metadata')
-        self.additional_metadata = attributes[:'additional_metadata']
-      end
-
-      if attributes.key?(:'required_file')
-        self.required_file = attributes[:'required_file']
-      end
-    end
-
-    # Show invalid properties with the reasons. Usually used together with valid?
-    # @return Array for valid properties with the reasons
-    def list_invalid_properties
-      invalid_properties = Array.new
-      if @required_file.nil?
-        invalid_properties.push('invalid value for "required_file", required_file cannot be nil.')
-      end
-
-      invalid_properties
-    end
-
-    # Check to see if the all the properties in the model are valid
-    # @return true if the model is valid
-    def valid?
-      return false if @required_file.nil?
-      true
-    end
-
-    # Checks equality by comparing each attribute.
-    # @param [Object] Object to be compared
-    def ==(o)
-      return true if self.equal?(o)
-      self.class == o.class &&
-          additional_metadata == o.additional_metadata &&
-          required_file == o.required_file
-    end
-
-    # @see the `==` method
-    # @param [Object] Object to be compared
-    def eql?(o)
-      self == o
-    end
-
-    # Calculates hash code according to all attributes.
-    # @return [Integer] Hash code
-    def hash
-      [additional_metadata, required_file].hash
-    end
-
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @return [Object] Returns the model itself
-    def self.build_from_hash(attributes)
-      new.build_from_hash(attributes)
-    end
-
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @return [Object] Returns the model itself
-    def build_from_hash(attributes)
-      return nil unless attributes.is_a?(Hash)
-      self.class.openapi_types.each_pair do |key, type|
-        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
-        elsif type =~ /\AArray<(.*)>/i
-          # check to ensure the input is an array given that the attribute
-          # is documented as an array but the input is not
-          if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
-          end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end
-      end
-
-      self
-    end
-
-    # Deserializes the data based on type
-    # @param string type Data type
-    # @param string value Value to be deserialized
-    # @return [Object] Deserialized data
-    def _deserialize(type, value)
-      case type.to_sym
-      when :Time
-        Time.parse(value)
-      when :Date
-        Date.parse(value)
-      when :String
-        value.to_s
-      when :Integer
-        value.to_i
-      when :Float
-        value.to_f
-      when :Boolean
-        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
-          true
-        else
-          false
-        end
-      when :Object
-        # generic object (usually a Hash), return directly
-        value
-      when /\AArray<(?<inner_type>.+)>\z/
-        inner_type = Regexp.last_match[:inner_type]
-        value.map { |v| _deserialize(inner_type, v) }
-      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
-        k_type = Regexp.last_match[:k_type]
-        v_type = Regexp.last_match[:v_type]
-        {}.tap do |hash|
-          value.each do |k, v|
-            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
-          end
-        end
-      else # model
-        # models (e.g. Pet) or oneOf
-        klass = Petstore.const_get(type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
-      end
-    end
-
-    # Returns the string representation of the object
-    # @return [String] String presentation of the object
-    def to_s
-      to_hash.to_s
-    end
-
-    # to_body is an alias to to_hash (backward compatibility)
-    # @return [Hash] Returns the object in the form of hash
-    def to_body
-      to_hash
-    end
-
-    # Returns the object in the form of hash
-    # @return [Hash] Returns the object in the form of hash
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
-
-        hash[param] = _to_hash(value)
-      end
-      hash
-    end
-
-    # Outputs non-array value in the form of hash
-    # For object, use to_hash. Otherwise, just return the value
-    # @param [Object] value Any valid value
-    # @return [Hash] Returns the value in the form of hash
-    def _to_hash(value)
-      if value.is_a?(Array)
-        value.compact.map { |v| _to_hash(v) }
-      elsif value.is_a?(Hash)
-        {}.tap do |hash|
-          value.each { |k, v| hash[k] = _to_hash(v) }
-        end
-      elsif value.respond_to? :to_hash
-        value.to_hash
-      else
-        value
-      end
-    end
-
-  end
-
-end
diff --git a/samples/client/petstore/ruby-faraday/spec/models/inline_object1_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/inline_object1_spec.rb
deleted file mode 100644
index a702fd774ea..00000000000
--- a/samples/client/petstore/ruby-faraday/spec/models/inline_object1_spec.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-=begin
-#OpenAPI Petstore
-
-#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-The version of the OpenAPI document: 1.0.0
-
-Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.0.0-SNAPSHOT
-
-=end
-
-require 'spec_helper'
-require 'json'
-require 'date'
-
-# Unit tests for Petstore::InlineObject1
-# Automatically generated by openapi-generator (https://openapi-generator.tech)
-# Please update as you see appropriate
-describe 'InlineObject1' do
-  before do
-    # run before each test
-    @instance = Petstore::InlineObject1.new
-  end
-
-  after do
-    # run after each test
-  end
-
-  describe 'test an instance of InlineObject1' do
-    it 'should create an instance of InlineObject1' do
-      expect(@instance).to be_instance_of(Petstore::InlineObject1)
-    end
-  end
-  describe 'test attribute "additional_metadata"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "file"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-end
diff --git a/samples/client/petstore/ruby-faraday/spec/models/inline_object2_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/inline_object2_spec.rb
deleted file mode 100644
index 7013915ea39..00000000000
--- a/samples/client/petstore/ruby-faraday/spec/models/inline_object2_spec.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-=begin
-#OpenAPI Petstore
-
-#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-The version of the OpenAPI document: 1.0.0
-
-Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.0.0-SNAPSHOT
-
-=end
-
-require 'spec_helper'
-require 'json'
-require 'date'
-
-# Unit tests for Petstore::InlineObject2
-# Automatically generated by openapi-generator (https://openapi-generator.tech)
-# Please update as you see appropriate
-describe 'InlineObject2' do
-  before do
-    # run before each test
-    @instance = Petstore::InlineObject2.new
-  end
-
-  after do
-    # run after each test
-  end
-
-  describe 'test an instance of InlineObject2' do
-    it 'should create an instance of InlineObject2' do
-      expect(@instance).to be_instance_of(Petstore::InlineObject2)
-    end
-  end
-  describe 'test attribute "enum_form_string_array"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-      # validator = Petstore::EnumTest::EnumAttributeValidator.new('Array<String>', [">", "$"])
-      # validator.allowable_values.each do |value|
-      #   expect { @instance.enum_form_string_array = value }.not_to raise_error
-      # end
-    end
-  end
-
-  describe 'test attribute "enum_form_string"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-      # validator = Petstore::EnumTest::EnumAttributeValidator.new('String', ["_abc", "-efg", "(xyz)"])
-      # validator.allowable_values.each do |value|
-      #   expect { @instance.enum_form_string = value }.not_to raise_error
-      # end
-    end
-  end
-
-end
diff --git a/samples/client/petstore/ruby-faraday/spec/models/inline_object3_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/inline_object3_spec.rb
deleted file mode 100644
index 4daf41b4ace..00000000000
--- a/samples/client/petstore/ruby-faraday/spec/models/inline_object3_spec.rb
+++ /dev/null
@@ -1,119 +0,0 @@
-=begin
-#OpenAPI Petstore
-
-#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-The version of the OpenAPI document: 1.0.0
-
-Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.0.0-SNAPSHOT
-
-=end
-
-require 'spec_helper'
-require 'json'
-require 'date'
-
-# Unit tests for Petstore::InlineObject3
-# Automatically generated by openapi-generator (https://openapi-generator.tech)
-# Please update as you see appropriate
-describe 'InlineObject3' do
-  before do
-    # run before each test
-    @instance = Petstore::InlineObject3.new
-  end
-
-  after do
-    # run after each test
-  end
-
-  describe 'test an instance of InlineObject3' do
-    it 'should create an instance of InlineObject3' do
-      expect(@instance).to be_instance_of(Petstore::InlineObject3)
-    end
-  end
-  describe 'test attribute "integer"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "int32"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "int64"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "number"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "float"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "double"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "string"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "pattern_without_delimiter"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "byte"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "binary"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "date"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "date_time"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "password"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "callback"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-end
diff --git a/samples/client/petstore/ruby-faraday/spec/models/inline_object4_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/inline_object4_spec.rb
deleted file mode 100644
index fa806f95860..00000000000
--- a/samples/client/petstore/ruby-faraday/spec/models/inline_object4_spec.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-=begin
-#OpenAPI Petstore
-
-#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-The version of the OpenAPI document: 1.0.0
-
-Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.0.0-SNAPSHOT
-
-=end
-
-require 'spec_helper'
-require 'json'
-require 'date'
-
-# Unit tests for Petstore::InlineObject4
-# Automatically generated by openapi-generator (https://openapi-generator.tech)
-# Please update as you see appropriate
-describe 'InlineObject4' do
-  before do
-    # run before each test
-    @instance = Petstore::InlineObject4.new
-  end
-
-  after do
-    # run after each test
-  end
-
-  describe 'test an instance of InlineObject4' do
-    it 'should create an instance of InlineObject4' do
-      expect(@instance).to be_instance_of(Petstore::InlineObject4)
-    end
-  end
-  describe 'test attribute "param"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "param2"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-end
diff --git a/samples/client/petstore/ruby-faraday/spec/models/inline_object5_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/inline_object5_spec.rb
deleted file mode 100644
index e2410b21bc0..00000000000
--- a/samples/client/petstore/ruby-faraday/spec/models/inline_object5_spec.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-=begin
-#OpenAPI Petstore
-
-#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-The version of the OpenAPI document: 1.0.0
-
-Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.0.0-SNAPSHOT
-
-=end
-
-require 'spec_helper'
-require 'json'
-require 'date'
-
-# Unit tests for Petstore::InlineObject5
-# Automatically generated by openapi-generator (https://openapi-generator.tech)
-# Please update as you see appropriate
-describe 'InlineObject5' do
-  before do
-    # run before each test
-    @instance = Petstore::InlineObject5.new
-  end
-
-  after do
-    # run after each test
-  end
-
-  describe 'test an instance of InlineObject5' do
-    it 'should create an instance of InlineObject5' do
-      expect(@instance).to be_instance_of(Petstore::InlineObject5)
-    end
-  end
-  describe 'test attribute "additional_metadata"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "required_file"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-end
diff --git a/samples/client/petstore/ruby-faraday/spec/models/inline_object_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/inline_object_spec.rb
deleted file mode 100644
index c5a7db44780..00000000000
--- a/samples/client/petstore/ruby-faraday/spec/models/inline_object_spec.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-=begin
-#OpenAPI Petstore
-
-#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-The version of the OpenAPI document: 1.0.0
-
-Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.0.0-SNAPSHOT
-
-=end
-
-require 'spec_helper'
-require 'json'
-require 'date'
-
-# Unit tests for Petstore::InlineObject
-# Automatically generated by openapi-generator (https://openapi-generator.tech)
-# Please update as you see appropriate
-describe 'InlineObject' do
-  before do
-    # run before each test
-    @instance = Petstore::InlineObject.new
-  end
-
-  after do
-    # run after each test
-  end
-
-  describe 'test an instance of InlineObject' do
-    it 'should create an instance of InlineObject' do
-      expect(@instance).to be_instance_of(Petstore::InlineObject)
-    end
-  end
-  describe 'test attribute "name"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "status"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-end
diff --git a/samples/client/petstore/ruby-faraday/spec/models/inline_response_default_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/inline_response_default_spec.rb
index 812470131b9..0174b9efd3b 100644
--- a/samples/client/petstore/ruby-faraday/spec/models/inline_response_default_spec.rb
+++ b/samples/client/petstore/ruby-faraday/spec/models/inline_response_default_spec.rb
@@ -17,19 +17,12 @@ require 'date'
 # Unit tests for Petstore::InlineResponseDefault
 # Automatically generated by openapi-generator (https://openapi-generator.tech)
 # Please update as you see appropriate
-describe 'InlineResponseDefault' do
-  before do
-    # run before each test
-    @instance = Petstore::InlineResponseDefault.new
-  end
-
-  after do
-    # run after each test
-  end
+describe Petstore::InlineResponseDefault do
+  let(:instance) { Petstore::InlineResponseDefault.new }
 
   describe 'test an instance of InlineResponseDefault' do
     it 'should create an instance of InlineResponseDefault' do
-      expect(@instance).to be_instance_of(Petstore::InlineResponseDefault)
+      expect(instance).to be_instance_of(Petstore::InlineResponseDefault)
     end
   end
   describe 'test attribute "string"' do
diff --git a/samples/client/petstore/ruby/.openapi-generator/FILES b/samples/client/petstore/ruby/.openapi-generator/FILES
index dff9045f9ba..e6cc5300c83 100644
--- a/samples/client/petstore/ruby/.openapi-generator/FILES
+++ b/samples/client/petstore/ruby/.openapi-generator/FILES
@@ -32,12 +32,6 @@ docs/Foo.md
 docs/FormatTest.md
 docs/HasOnlyReadOnly.md
 docs/HealthCheckResult.md
-docs/InlineObject.md
-docs/InlineObject1.md
-docs/InlineObject2.md
-docs/InlineObject3.md
-docs/InlineObject4.md
-docs/InlineObject5.md
 docs/InlineResponseDefault.md
 docs/List.md
 docs/MapTest.md
@@ -97,12 +91,6 @@ lib/petstore/models/foo.rb
 lib/petstore/models/format_test.rb
 lib/petstore/models/has_only_read_only.rb
 lib/petstore/models/health_check_result.rb
-lib/petstore/models/inline_object.rb
-lib/petstore/models/inline_object1.rb
-lib/petstore/models/inline_object2.rb
-lib/petstore/models/inline_object3.rb
-lib/petstore/models/inline_object4.rb
-lib/petstore/models/inline_object5.rb
 lib/petstore/models/inline_response_default.rb
 lib/petstore/models/list.rb
 lib/petstore/models/map_test.rb
diff --git a/samples/client/petstore/ruby/README.md b/samples/client/petstore/ruby/README.md
index 719039e5311..35c76f3817e 100644
--- a/samples/client/petstore/ruby/README.md
+++ b/samples/client/petstore/ruby/README.md
@@ -141,12 +141,6 @@ Class | Method | HTTP request | Description
  - [Petstore::FormatTest](docs/FormatTest.md)
  - [Petstore::HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [Petstore::HealthCheckResult](docs/HealthCheckResult.md)
- - [Petstore::InlineObject](docs/InlineObject.md)
- - [Petstore::InlineObject1](docs/InlineObject1.md)
- - [Petstore::InlineObject2](docs/InlineObject2.md)
- - [Petstore::InlineObject3](docs/InlineObject3.md)
- - [Petstore::InlineObject4](docs/InlineObject4.md)
- - [Petstore::InlineObject5](docs/InlineObject5.md)
  - [Petstore::InlineResponseDefault](docs/InlineResponseDefault.md)
  - [Petstore::List](docs/List.md)
  - [Petstore::MapTest](docs/MapTest.md)
diff --git a/samples/client/petstore/ruby/lib/petstore.rb b/samples/client/petstore/ruby/lib/petstore.rb
index 7f8ae56e123..f0df2170db0 100644
--- a/samples/client/petstore/ruby/lib/petstore.rb
+++ b/samples/client/petstore/ruby/lib/petstore.rb
@@ -40,12 +40,6 @@ require 'petstore/models/foo'
 require 'petstore/models/format_test'
 require 'petstore/models/has_only_read_only'
 require 'petstore/models/health_check_result'
-require 'petstore/models/inline_object'
-require 'petstore/models/inline_object1'
-require 'petstore/models/inline_object2'
-require 'petstore/models/inline_object3'
-require 'petstore/models/inline_object4'
-require 'petstore/models/inline_object5'
 require 'petstore/models/inline_response_default'
 require 'petstore/models/list'
 require 'petstore/models/map_test'
diff --git a/samples/client/petstore/ruby/spec/models/inline_object1_spec.rb b/samples/client/petstore/ruby/spec/models/inline_object1_spec.rb
deleted file mode 100644
index a702fd774ea..00000000000
--- a/samples/client/petstore/ruby/spec/models/inline_object1_spec.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-=begin
-#OpenAPI Petstore
-
-#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-The version of the OpenAPI document: 1.0.0
-
-Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.0.0-SNAPSHOT
-
-=end
-
-require 'spec_helper'
-require 'json'
-require 'date'
-
-# Unit tests for Petstore::InlineObject1
-# Automatically generated by openapi-generator (https://openapi-generator.tech)
-# Please update as you see appropriate
-describe 'InlineObject1' do
-  before do
-    # run before each test
-    @instance = Petstore::InlineObject1.new
-  end
-
-  after do
-    # run after each test
-  end
-
-  describe 'test an instance of InlineObject1' do
-    it 'should create an instance of InlineObject1' do
-      expect(@instance).to be_instance_of(Petstore::InlineObject1)
-    end
-  end
-  describe 'test attribute "additional_metadata"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "file"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-end
diff --git a/samples/client/petstore/ruby/spec/models/inline_object2_spec.rb b/samples/client/petstore/ruby/spec/models/inline_object2_spec.rb
deleted file mode 100644
index 7013915ea39..00000000000
--- a/samples/client/petstore/ruby/spec/models/inline_object2_spec.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-=begin
-#OpenAPI Petstore
-
-#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-The version of the OpenAPI document: 1.0.0
-
-Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.0.0-SNAPSHOT
-
-=end
-
-require 'spec_helper'
-require 'json'
-require 'date'
-
-# Unit tests for Petstore::InlineObject2
-# Automatically generated by openapi-generator (https://openapi-generator.tech)
-# Please update as you see appropriate
-describe 'InlineObject2' do
-  before do
-    # run before each test
-    @instance = Petstore::InlineObject2.new
-  end
-
-  after do
-    # run after each test
-  end
-
-  describe 'test an instance of InlineObject2' do
-    it 'should create an instance of InlineObject2' do
-      expect(@instance).to be_instance_of(Petstore::InlineObject2)
-    end
-  end
-  describe 'test attribute "enum_form_string_array"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-      # validator = Petstore::EnumTest::EnumAttributeValidator.new('Array<String>', [">", "$"])
-      # validator.allowable_values.each do |value|
-      #   expect { @instance.enum_form_string_array = value }.not_to raise_error
-      # end
-    end
-  end
-
-  describe 'test attribute "enum_form_string"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-      # validator = Petstore::EnumTest::EnumAttributeValidator.new('String', ["_abc", "-efg", "(xyz)"])
-      # validator.allowable_values.each do |value|
-      #   expect { @instance.enum_form_string = value }.not_to raise_error
-      # end
-    end
-  end
-
-end
diff --git a/samples/client/petstore/ruby/spec/models/inline_object3_spec.rb b/samples/client/petstore/ruby/spec/models/inline_object3_spec.rb
deleted file mode 100644
index 4daf41b4ace..00000000000
--- a/samples/client/petstore/ruby/spec/models/inline_object3_spec.rb
+++ /dev/null
@@ -1,119 +0,0 @@
-=begin
-#OpenAPI Petstore
-
-#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-The version of the OpenAPI document: 1.0.0
-
-Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.0.0-SNAPSHOT
-
-=end
-
-require 'spec_helper'
-require 'json'
-require 'date'
-
-# Unit tests for Petstore::InlineObject3
-# Automatically generated by openapi-generator (https://openapi-generator.tech)
-# Please update as you see appropriate
-describe 'InlineObject3' do
-  before do
-    # run before each test
-    @instance = Petstore::InlineObject3.new
-  end
-
-  after do
-    # run after each test
-  end
-
-  describe 'test an instance of InlineObject3' do
-    it 'should create an instance of InlineObject3' do
-      expect(@instance).to be_instance_of(Petstore::InlineObject3)
-    end
-  end
-  describe 'test attribute "integer"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "int32"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "int64"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "number"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "float"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "double"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "string"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "pattern_without_delimiter"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "byte"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "binary"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "date"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "date_time"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "password"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "callback"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-end
diff --git a/samples/client/petstore/ruby/spec/models/inline_object4_spec.rb b/samples/client/petstore/ruby/spec/models/inline_object4_spec.rb
deleted file mode 100644
index fa806f95860..00000000000
--- a/samples/client/petstore/ruby/spec/models/inline_object4_spec.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-=begin
-#OpenAPI Petstore
-
-#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-The version of the OpenAPI document: 1.0.0
-
-Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.0.0-SNAPSHOT
-
-=end
-
-require 'spec_helper'
-require 'json'
-require 'date'
-
-# Unit tests for Petstore::InlineObject4
-# Automatically generated by openapi-generator (https://openapi-generator.tech)
-# Please update as you see appropriate
-describe 'InlineObject4' do
-  before do
-    # run before each test
-    @instance = Petstore::InlineObject4.new
-  end
-
-  after do
-    # run after each test
-  end
-
-  describe 'test an instance of InlineObject4' do
-    it 'should create an instance of InlineObject4' do
-      expect(@instance).to be_instance_of(Petstore::InlineObject4)
-    end
-  end
-  describe 'test attribute "param"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "param2"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-end
diff --git a/samples/client/petstore/ruby/spec/models/inline_object5_spec.rb b/samples/client/petstore/ruby/spec/models/inline_object5_spec.rb
deleted file mode 100644
index e2410b21bc0..00000000000
--- a/samples/client/petstore/ruby/spec/models/inline_object5_spec.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-=begin
-#OpenAPI Petstore
-
-#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-The version of the OpenAPI document: 1.0.0
-
-Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.0.0-SNAPSHOT
-
-=end
-
-require 'spec_helper'
-require 'json'
-require 'date'
-
-# Unit tests for Petstore::InlineObject5
-# Automatically generated by openapi-generator (https://openapi-generator.tech)
-# Please update as you see appropriate
-describe 'InlineObject5' do
-  before do
-    # run before each test
-    @instance = Petstore::InlineObject5.new
-  end
-
-  after do
-    # run after each test
-  end
-
-  describe 'test an instance of InlineObject5' do
-    it 'should create an instance of InlineObject5' do
-      expect(@instance).to be_instance_of(Petstore::InlineObject5)
-    end
-  end
-  describe 'test attribute "additional_metadata"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "required_file"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-end
diff --git a/samples/client/petstore/ruby/spec/models/inline_object_spec.rb b/samples/client/petstore/ruby/spec/models/inline_object_spec.rb
deleted file mode 100644
index c5a7db44780..00000000000
--- a/samples/client/petstore/ruby/spec/models/inline_object_spec.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-=begin
-#OpenAPI Petstore
-
-#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-The version of the OpenAPI document: 1.0.0
-
-Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.0.0-SNAPSHOT
-
-=end
-
-require 'spec_helper'
-require 'json'
-require 'date'
-
-# Unit tests for Petstore::InlineObject
-# Automatically generated by openapi-generator (https://openapi-generator.tech)
-# Please update as you see appropriate
-describe 'InlineObject' do
-  before do
-    # run before each test
-    @instance = Petstore::InlineObject.new
-  end
-
-  after do
-    # run after each test
-  end
-
-  describe 'test an instance of InlineObject' do
-    it 'should create an instance of InlineObject' do
-      expect(@instance).to be_instance_of(Petstore::InlineObject)
-    end
-  end
-  describe 'test attribute "name"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "status"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-end
diff --git a/samples/client/petstore/ruby/spec/models/inline_response_default_spec.rb b/samples/client/petstore/ruby/spec/models/inline_response_default_spec.rb
index 812470131b9..0174b9efd3b 100644
--- a/samples/client/petstore/ruby/spec/models/inline_response_default_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/inline_response_default_spec.rb
@@ -17,19 +17,12 @@ require 'date'
 # Unit tests for Petstore::InlineResponseDefault
 # Automatically generated by openapi-generator (https://openapi-generator.tech)
 # Please update as you see appropriate
-describe 'InlineResponseDefault' do
-  before do
-    # run before each test
-    @instance = Petstore::InlineResponseDefault.new
-  end
-
-  after do
-    # run after each test
-  end
+describe Petstore::InlineResponseDefault do
+  let(:instance) { Petstore::InlineResponseDefault.new }
 
   describe 'test an instance of InlineResponseDefault' do
     it 'should create an instance of InlineResponseDefault' do
-      expect(@instance).to be_instance_of(Petstore::InlineResponseDefault)
+      expect(instance).to be_instance_of(Petstore::InlineResponseDefault)
     end
   end
   describe 'test attribute "string"' do
diff --git a/samples/client/petstore/scala-akka/.openapi-generator/FILES b/samples/client/petstore/scala-akka/.openapi-generator/FILES
index 301241de2bd..8d22043b5a9 100644
--- a/samples/client/petstore/scala-akka/.openapi-generator/FILES
+++ b/samples/client/petstore/scala-akka/.openapi-generator/FILES
@@ -12,8 +12,6 @@ src/main/scala/org/openapitools/client/core/Serializers.scala
 src/main/scala/org/openapitools/client/core/requests.scala
 src/main/scala/org/openapitools/client/model/ApiResponse.scala
 src/main/scala/org/openapitools/client/model/Category.scala
-src/main/scala/org/openapitools/client/model/InlineObject.scala
-src/main/scala/org/openapitools/client/model/InlineObject1.scala
 src/main/scala/org/openapitools/client/model/Order.scala
 src/main/scala/org/openapitools/client/model/Pet.scala
 src/main/scala/org/openapitools/client/model/Tag.scala
diff --git a/samples/client/petstore/scala-akka/README.md b/samples/client/petstore/scala-akka/README.md
index effa8f548eb..cc830a260e3 100644
--- a/samples/client/petstore/scala-akka/README.md
+++ b/samples/client/petstore/scala-akka/README.md
@@ -91,8 +91,6 @@ Class | Method | HTTP request | Description
 
  - [ApiResponse](ApiResponse.md)
  - [Category](Category.md)
- - [InlineObject](InlineObject.md)
- - [InlineObject1](InlineObject1.md)
  - [Order](Order.md)
  - [Pet](Pet.md)
  - [Tag](Tag.md)
diff --git a/samples/client/petstore/scala-sttp/.openapi-generator/FILES b/samples/client/petstore/scala-sttp/.openapi-generator/FILES
index bf41f88a7b3..aeb15657fb9 100644
--- a/samples/client/petstore/scala-sttp/.openapi-generator/FILES
+++ b/samples/client/petstore/scala-sttp/.openapi-generator/FILES
@@ -8,8 +8,6 @@ src/main/scala/org/openapitools/client/core/DateSerializers.scala
 src/main/scala/org/openapitools/client/core/JsonSupport.scala
 src/main/scala/org/openapitools/client/model/ApiResponse.scala
 src/main/scala/org/openapitools/client/model/Category.scala
-src/main/scala/org/openapitools/client/model/InlineObject.scala
-src/main/scala/org/openapitools/client/model/InlineObject1.scala
 src/main/scala/org/openapitools/client/model/Order.scala
 src/main/scala/org/openapitools/client/model/Pet.scala
 src/main/scala/org/openapitools/client/model/Tag.scala
diff --git a/samples/client/petstore/scala-sttp/README.md b/samples/client/petstore/scala-sttp/README.md
index 7d0aef8990b..678cf67799c 100644
--- a/samples/client/petstore/scala-sttp/README.md
+++ b/samples/client/petstore/scala-sttp/README.md
@@ -91,8 +91,6 @@ Class | Method | HTTP request | Description
 
  - [ApiResponse](ApiResponse.md)
  - [Category](Category.md)
- - [InlineObject](InlineObject.md)
- - [InlineObject1](InlineObject1.md)
  - [Order](Order.md)
  - [Pet](Pet.md)
  - [Tag](Tag.md)
diff --git a/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts b/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts
index b330ba8ec8f..9b2c0fd3fed 100644
--- a/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts
@@ -63,44 +63,6 @@ export interface Category {
      */
     name?: string;
 }
-/**
- * 
- * @export
- * @interface InlineObject
- */
-export interface InlineObject {
-    /**
-     * Updated name of the pet
-     * @type {string}
-     * @memberof InlineObject
-     */
-    name?: string;
-    /**
-     * Updated status of the pet
-     * @type {string}
-     * @memberof InlineObject
-     */
-    status?: string;
-}
-/**
- * 
- * @export
- * @interface InlineObject1
- */
-export interface InlineObject1 {
-    /**
-     * Additional data to pass to server
-     * @type {string}
-     * @memberof InlineObject1
-     */
-    additionalMetadata?: string;
-    /**
-     * file to upload
-     * @type {any}
-     * @memberof InlineObject1
-     */
-    file?: any;
-}
 /**
  * An order for a pets from the pet store
  * @export
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/.openapi-generator/FILES b/samples/client/petstore/typescript-fetch/builds/default-v3.0/.openapi-generator/FILES
index 853775c10dc..f59d2325423 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/.openapi-generator/FILES
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/.openapi-generator/FILES
@@ -28,12 +28,6 @@ models/Foo.ts
 models/FormatTest.ts
 models/HasOnlyReadOnly.ts
 models/HealthCheckResult.ts
-models/InlineObject.ts
-models/InlineObject1.ts
-models/InlineObject2.ts
-models/InlineObject3.ts
-models/InlineObject4.ts
-models/InlineObject5.ts
 models/InlineResponseDefault.ts
 models/List.ts
 models/MapTest.ts
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/index.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/index.ts
index 9a7ba7b33db..9d4091d7336 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/index.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/index.ts
@@ -19,12 +19,6 @@ export * from './Foo';
 export * from './FormatTest';
 export * from './HasOnlyReadOnly';
 export * from './HealthCheckResult';
-export * from './InlineObject';
-export * from './InlineObject1';
-export * from './InlineObject2';
-export * from './InlineObject3';
-export * from './InlineObject4';
-export * from './InlineObject5';
 export * from './InlineResponseDefault';
 export * from './List';
 export * from './MapTest';
diff --git a/samples/config/petstore/protobuf-schema/.openapi-generator/FILES b/samples/config/petstore/protobuf-schema/.openapi-generator/FILES
index fefe8909e75..701c1c5236b 100644
--- a/samples/config/petstore/protobuf-schema/.openapi-generator/FILES
+++ b/samples/config/petstore/protobuf-schema/.openapi-generator/FILES
@@ -1,8 +1,6 @@
 README.md
 models/api_response.proto
 models/category.proto
-models/inline_object.proto
-models/inline_object1.proto
 models/order.proto
 models/pet.proto
 models/tag.proto
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/.openapi-generator/FILES b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/.openapi-generator/FILES
index fc6fd23b987..b14eb44e2a0 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/.openapi-generator/FILES
@@ -3,8 +3,6 @@ README.md
 analysis_options.yaml
 doc/ApiResponse.md
 doc/Category.md
-doc/InlineObject.md
-doc/InlineObject1.md
 doc/Order.md
 doc/Pet.md
 doc/PetApi.md
@@ -23,8 +21,6 @@ lib/auth/basic_auth.dart
 lib/auth/oauth.dart
 lib/model/api_response.dart
 lib/model/category.dart
-lib/model/inline_object.dart
-lib/model/inline_object1.dart
 lib/model/order.dart
 lib/model/pet.dart
 lib/model/tag.dart
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/README.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/README.md
index 63eb7e3c20c..dfbf0dc4cd9 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/README.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/README.md
@@ -84,8 +84,6 @@ Class | Method | HTTP request | Description
 
  - [ApiResponse](doc//ApiResponse.md)
  - [Category](doc//Category.md)
- - [InlineObject](doc//InlineObject.md)
- - [InlineObject1](doc//InlineObject1.md)
  - [Order](doc//Order.md)
  - [Pet](doc//Pet.md)
  - [Tag](doc//Tag.md)
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/lib/serializers.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/lib/serializers.dart
index 3173d4bb5dc..5db183b7438 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/lib/serializers.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/lib/serializers.dart
@@ -8,8 +8,6 @@ import 'package:built_value/standard_json_plugin.dart';
 
 import 'package:openapi/model/api_response.dart';
 import 'package:openapi/model/category.dart';
-import 'package:openapi/model/inline_object.dart';
-import 'package:openapi/model/inline_object1.dart';
 import 'package:openapi/model/order.dart';
 import 'package:openapi/model/pet.dart';
 import 'package:openapi/model/tag.dart';
@@ -21,8 +19,6 @@ part 'serializers.g.dart';
 @SerializersFor(const [
 ApiResponse,
 Category,
-InlineObject,
-InlineObject1,
 Order,
 Pet,
 Tag,
@@ -39,12 +35,6 @@ const FullType(BuiltList, const [const FullType(ApiResponse)]),
 const FullType(BuiltList, const [const FullType(Category)]),
 () => new ListBuilder<Category>())
 ..addBuilderFactory(
-const FullType(BuiltList, const [const FullType(InlineObject)]),
-() => new ListBuilder<InlineObject>())
-..addBuilderFactory(
-const FullType(BuiltList, const [const FullType(InlineObject1)]),
-() => new ListBuilder<InlineObject1>())
-..addBuilderFactory(
 const FullType(BuiltList, const [const FullType(Order)]),
 () => new ListBuilder<Order>())
 ..addBuilderFactory(
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/test/inline_object1_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/test/inline_object1_test.dart
deleted file mode 100644
index e1fa552bdaa..00000000000
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/test/inline_object1_test.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-import 'package:openapi/model/inline_object1.dart';
-import 'package:test/test.dart';
-
-// tests for InlineObject1
-void main() {
-  final instance = InlineObject1();
-
-  group(InlineObject1, () {
-    // Additional data to pass to server
-    // String additionalMetadata (default value: null)
-    test('to test the property `additionalMetadata`', () async {
-      // TODO
-    });
-
-    // file to upload
-    // Uint8List file (default value: null)
-    test('to test the property `file`', () async {
-      // TODO
-    });
-
-
-  });
-
-}
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/test/inline_object_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/test/inline_object_test.dart
deleted file mode 100644
index 551c6a07d23..00000000000
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/test/inline_object_test.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-import 'package:openapi/model/inline_object.dart';
-import 'package:test/test.dart';
-
-// tests for InlineObject
-void main() {
-  final instance = InlineObject();
-
-  group(InlineObject, () {
-    // Updated name of the pet
-    // String name (default value: null)
-    test('to test the property `name`', () async {
-      // TODO
-    });
-
-    // Updated status of the pet
-    // String status (default value: null)
-    test('to test the property `status`', () async {
-      // TODO
-    });
-
-
-  });
-
-}
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/.openapi-generator/FILES b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/.openapi-generator/FILES
index 3e0ed4324bd..a4900515e29 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/.openapi-generator/FILES
@@ -25,12 +25,6 @@ doc/Foo.md
 doc/FormatTest.md
 doc/HasOnlyReadOnly.md
 doc/HealthCheckResult.md
-doc/InlineObject.md
-doc/InlineObject1.md
-doc/InlineObject2.md
-doc/InlineObject3.md
-doc/InlineObject4.md
-doc/InlineObject5.md
 doc/InlineResponseDefault.md
 doc/MapTest.md
 doc/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -90,12 +84,6 @@ lib/model/foo.dart
 lib/model/format_test.dart
 lib/model/has_only_read_only.dart
 lib/model/health_check_result.dart
-lib/model/inline_object.dart
-lib/model/inline_object1.dart
-lib/model/inline_object2.dart
-lib/model/inline_object3.dart
-lib/model/inline_object4.dart
-lib/model/inline_object5.dart
 lib/model/inline_response_default.dart
 lib/model/map_test.dart
 lib/model/mixed_properties_and_additional_properties_class.dart
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/README.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/README.md
index a9a4c91ee55..0f8dc08d50f 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/README.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/README.md
@@ -121,12 +121,6 @@ Class | Method | HTTP request | Description
  - [FormatTest](doc//FormatTest.md)
  - [HasOnlyReadOnly](doc//HasOnlyReadOnly.md)
  - [HealthCheckResult](doc//HealthCheckResult.md)
- - [InlineObject](doc//InlineObject.md)
- - [InlineObject1](doc//InlineObject1.md)
- - [InlineObject2](doc//InlineObject2.md)
- - [InlineObject3](doc//InlineObject3.md)
- - [InlineObject4](doc//InlineObject4.md)
- - [InlineObject5](doc//InlineObject5.md)
  - [InlineResponseDefault](doc//InlineResponseDefault.md)
  - [MapTest](doc//MapTest.md)
  - [MixedPropertiesAndAdditionalPropertiesClass](doc//MixedPropertiesAndAdditionalPropertiesClass.md)
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/serializers.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/serializers.dart
index 81e4bbcd3ef..833c5800619 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/serializers.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/serializers.dart
@@ -26,12 +26,6 @@ import 'package:openapi/model/foo.dart';
 import 'package:openapi/model/format_test.dart';
 import 'package:openapi/model/has_only_read_only.dart';
 import 'package:openapi/model/health_check_result.dart';
-import 'package:openapi/model/inline_object.dart';
-import 'package:openapi/model/inline_object1.dart';
-import 'package:openapi/model/inline_object2.dart';
-import 'package:openapi/model/inline_object3.dart';
-import 'package:openapi/model/inline_object4.dart';
-import 'package:openapi/model/inline_object5.dart';
 import 'package:openapi/model/inline_response_default.dart';
 import 'package:openapi/model/map_test.dart';
 import 'package:openapi/model/mixed_properties_and_additional_properties_class.dart';
@@ -80,12 +74,6 @@ Foo,
 FormatTest,
 HasOnlyReadOnly,
 HealthCheckResult,
-InlineObject,
-InlineObject1,
-InlineObject2,
-InlineObject3,
-InlineObject4,
-InlineObject5,
 InlineResponseDefault,
 MapTest,
 MixedPropertiesAndAdditionalPropertiesClass,
@@ -175,24 +163,6 @@ const FullType(BuiltList, const [const FullType(HasOnlyReadOnly)]),
 const FullType(BuiltList, const [const FullType(HealthCheckResult)]),
 () => new ListBuilder<HealthCheckResult>())
 ..addBuilderFactory(
-const FullType(BuiltList, const [const FullType(InlineObject)]),
-() => new ListBuilder<InlineObject>())
-..addBuilderFactory(
-const FullType(BuiltList, const [const FullType(InlineObject1)]),
-() => new ListBuilder<InlineObject1>())
-..addBuilderFactory(
-const FullType(BuiltList, const [const FullType(InlineObject2)]),
-() => new ListBuilder<InlineObject2>())
-..addBuilderFactory(
-const FullType(BuiltList, const [const FullType(InlineObject3)]),
-() => new ListBuilder<InlineObject3>())
-..addBuilderFactory(
-const FullType(BuiltList, const [const FullType(InlineObject4)]),
-() => new ListBuilder<InlineObject4>())
-..addBuilderFactory(
-const FullType(BuiltList, const [const FullType(InlineObject5)]),
-() => new ListBuilder<InlineObject5>())
-..addBuilderFactory(
 const FullType(BuiltList, const [const FullType(InlineResponseDefault)]),
 () => new ListBuilder<InlineResponseDefault>())
 ..addBuilderFactory(
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/inline_object1_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/inline_object1_test.dart
deleted file mode 100644
index e1fa552bdaa..00000000000
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/inline_object1_test.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-import 'package:openapi/model/inline_object1.dart';
-import 'package:test/test.dart';
-
-// tests for InlineObject1
-void main() {
-  final instance = InlineObject1();
-
-  group(InlineObject1, () {
-    // Additional data to pass to server
-    // String additionalMetadata (default value: null)
-    test('to test the property `additionalMetadata`', () async {
-      // TODO
-    });
-
-    // file to upload
-    // Uint8List file (default value: null)
-    test('to test the property `file`', () async {
-      // TODO
-    });
-
-
-  });
-
-}
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/inline_object2_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/inline_object2_test.dart
deleted file mode 100644
index b79ae66b097..00000000000
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/inline_object2_test.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-import 'package:openapi/model/inline_object2.dart';
-import 'package:test/test.dart';
-
-// tests for InlineObject2
-void main() {
-  final instance = InlineObject2();
-
-  group(InlineObject2, () {
-    // Form parameter enum test (string array)
-    // BuiltList<String> enumFormStringArray (default value: const [])
-    test('to test the property `enumFormStringArray`', () async {
-      // TODO
-    });
-
-    // Form parameter enum test (string)
-    // String enumFormString (default value: '-efg')
-    test('to test the property `enumFormString`', () async {
-      // TODO
-    });
-
-
-  });
-
-}
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/inline_object3_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/inline_object3_test.dart
deleted file mode 100644
index d913891721c..00000000000
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/inline_object3_test.dart
+++ /dev/null
@@ -1,96 +0,0 @@
-import 'package:openapi/model/inline_object3.dart';
-import 'package:test/test.dart';
-
-// tests for InlineObject3
-void main() {
-  final instance = InlineObject3();
-
-  group(InlineObject3, () {
-    // None
-    // int integer (default value: null)
-    test('to test the property `integer`', () async {
-      // TODO
-    });
-
-    // None
-    // int int32 (default value: null)
-    test('to test the property `int32`', () async {
-      // TODO
-    });
-
-    // None
-    // int int64 (default value: null)
-    test('to test the property `int64`', () async {
-      // TODO
-    });
-
-    // None
-    // num number (default value: null)
-    test('to test the property `number`', () async {
-      // TODO
-    });
-
-    // None
-    // double float (default value: null)
-    test('to test the property `float`', () async {
-      // TODO
-    });
-
-    // None
-    // double double_ (default value: null)
-    test('to test the property `double_`', () async {
-      // TODO
-    });
-
-    // None
-    // String string (default value: null)
-    test('to test the property `string`', () async {
-      // TODO
-    });
-
-    // None
-    // String patternWithoutDelimiter (default value: null)
-    test('to test the property `patternWithoutDelimiter`', () async {
-      // TODO
-    });
-
-    // None
-    // String byte (default value: null)
-    test('to test the property `byte`', () async {
-      // TODO
-    });
-
-    // None
-    // Uint8List binary (default value: null)
-    test('to test the property `binary`', () async {
-      // TODO
-    });
-
-    // None
-    // DateTime date (default value: null)
-    test('to test the property `date`', () async {
-      // TODO
-    });
-
-    // None
-    // DateTime dateTime (default value: null)
-    test('to test the property `dateTime`', () async {
-      // TODO
-    });
-
-    // None
-    // String password (default value: null)
-    test('to test the property `password`', () async {
-      // TODO
-    });
-
-    // None
-    // String callback (default value: null)
-    test('to test the property `callback`', () async {
-      // TODO
-    });
-
-
-  });
-
-}
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/inline_object4_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/inline_object4_test.dart
deleted file mode 100644
index 73c073efc0a..00000000000
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/inline_object4_test.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-import 'package:openapi/model/inline_object4.dart';
-import 'package:test/test.dart';
-
-// tests for InlineObject4
-void main() {
-  final instance = InlineObject4();
-
-  group(InlineObject4, () {
-    // field1
-    // String param (default value: null)
-    test('to test the property `param`', () async {
-      // TODO
-    });
-
-    // field2
-    // String param2 (default value: null)
-    test('to test the property `param2`', () async {
-      // TODO
-    });
-
-
-  });
-
-}
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/inline_object5_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/inline_object5_test.dart
deleted file mode 100644
index 4e4fb7e9229..00000000000
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/inline_object5_test.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-import 'package:openapi/model/inline_object5.dart';
-import 'package:test/test.dart';
-
-// tests for InlineObject5
-void main() {
-  final instance = InlineObject5();
-
-  group(InlineObject5, () {
-    // Additional data to pass to server
-    // String additionalMetadata (default value: null)
-    test('to test the property `additionalMetadata`', () async {
-      // TODO
-    });
-
-    // file to upload
-    // Uint8List requiredFile (default value: null)
-    test('to test the property `requiredFile`', () async {
-      // TODO
-    });
-
-
-  });
-
-}
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/inline_object_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/inline_object_test.dart
deleted file mode 100644
index 551c6a07d23..00000000000
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/inline_object_test.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-import 'package:openapi/model/inline_object.dart';
-import 'package:test/test.dart';
-
-// tests for InlineObject
-void main() {
-  final instance = InlineObject();
-
-  group(InlineObject, () {
-    // Updated name of the pet
-    // String name (default value: null)
-    test('to test the property `name`', () async {
-      // TODO
-    });
-
-    // Updated status of the pet
-    // String status (default value: null)
-    test('to test the property `status`', () async {
-      // TODO
-    });
-
-
-  });
-
-}
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib/.openapi-generator/FILES b/samples/openapi3/client/petstore/dart2/petstore_client_lib/.openapi-generator/FILES
index cf77ef761d2..7cc5afea821 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib/.openapi-generator/FILES
@@ -3,8 +3,6 @@
 README.md
 doc/ApiResponse.md
 doc/Category.md
-doc/InlineObject.md
-doc/InlineObject1.md
 doc/Order.md
 doc/Pet.md
 doc/PetApi.md
@@ -27,8 +25,6 @@ lib/auth/http_bearer_auth.dart
 lib/auth/oauth.dart
 lib/model/api_response.dart
 lib/model/category.dart
-lib/model/inline_object.dart
-lib/model/inline_object1.dart
 lib/model/order.dart
 lib/model/pet.dart
 lib/model/tag.dart
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib/README.md b/samples/openapi3/client/petstore/dart2/petstore_client_lib/README.md
index 7ad8c2ceb5e..99bd229f3c5 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib/README.md
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib/README.md
@@ -86,8 +86,6 @@ Class | Method | HTTP request | Description
 
  - [ApiResponse](doc//ApiResponse.md)
  - [Category](doc//Category.md)
- - [InlineObject](doc//InlineObject.md)
- - [InlineObject1](doc//InlineObject1.md)
  - [Order](doc//Order.md)
  - [Pet](doc//Pet.md)
  - [Tag](doc//Tag.md)
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api.dart
index 2541a00eaf7..5fa4f759553 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api.dart
@@ -32,8 +32,6 @@ part 'api/user_api.dart';
 
 part 'model/api_response.dart';
 part 'model/category.dart';
-part 'model/inline_object.dart';
-part 'model/inline_object1.dart';
 part 'model/order.dart';
 part 'model/pet.dart';
 part 'model/tag.dart';
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api_client.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api_client.dart
index 99e6eec226f..79394cc8335 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api_client.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api_client.dart
@@ -165,10 +165,6 @@ class ApiClient {
           return ApiResponse.fromJson(value);
         case 'Category':
           return Category.fromJson(value);
-        case 'InlineObject':
-          return InlineObject.fromJson(value);
-        case 'InlineObject1':
-          return InlineObject1.fromJson(value);
         case 'Order':
           return Order.fromJson(value);
         case 'Pet':
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib/test/inline_object1_test.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib/test/inline_object1_test.dart
deleted file mode 100644
index 0ee5baa0570..00000000000
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib/test/inline_object1_test.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-import 'package:openapi/api.dart';
-import 'package:test/test.dart';
-
-// tests for InlineObject1
-void main() {
-  final instance = InlineObject1();
-
-  group('test InlineObject1', () {
-    // Additional data to pass to server
-    // String additionalMetadata
-    test('to test the property `additionalMetadata`', () async {
-      // TODO
-    });
-
-    // file to upload
-    // MultipartFile file
-    test('to test the property `file`', () async {
-      // TODO
-    });
-
-
-  });
-
-}
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib/test/inline_object_test.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib/test/inline_object_test.dart
deleted file mode 100644
index f340e52b1d6..00000000000
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib/test/inline_object_test.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-import 'package:openapi/api.dart';
-import 'package:test/test.dart';
-
-// tests for InlineObject
-void main() {
-  final instance = InlineObject();
-
-  group('test InlineObject', () {
-    // Updated name of the pet
-    // String name
-    test('to test the property `name`', () async {
-      // TODO
-    });
-
-    // Updated status of the pet
-    // String status
-    test('to test the property `status`', () async {
-      // TODO
-    });
-
-
-  });
-
-}
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/.openapi-generator/FILES b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/.openapi-generator/FILES
index f966a261a04..ef5de1dfbd0 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/.openapi-generator/FILES
@@ -26,12 +26,6 @@ doc/Foo.md
 doc/FormatTest.md
 doc/HasOnlyReadOnly.md
 doc/HealthCheckResult.md
-doc/InlineObject.md
-doc/InlineObject1.md
-doc/InlineObject2.md
-doc/InlineObject3.md
-doc/InlineObject4.md
-doc/InlineObject5.md
 doc/InlineResponseDefault.md
 doc/MapTest.md
 doc/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -95,12 +89,6 @@ lib/model/foo.dart
 lib/model/format_test.dart
 lib/model/has_only_read_only.dart
 lib/model/health_check_result.dart
-lib/model/inline_object.dart
-lib/model/inline_object1.dart
-lib/model/inline_object2.dart
-lib/model/inline_object3.dart
-lib/model/inline_object4.dart
-lib/model/inline_object5.dart
 lib/model/inline_response_default.dart
 lib/model/map_test.dart
 lib/model/mixed_properties_and_additional_properties_class.dart
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/README.md b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/README.md
index c8c4eac75c2..6e050e1ead8 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/README.md
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/README.md
@@ -122,12 +122,6 @@ Class | Method | HTTP request | Description
  - [FormatTest](doc//FormatTest.md)
  - [HasOnlyReadOnly](doc//HasOnlyReadOnly.md)
  - [HealthCheckResult](doc//HealthCheckResult.md)
- - [InlineObject](doc//InlineObject.md)
- - [InlineObject1](doc//InlineObject1.md)
- - [InlineObject2](doc//InlineObject2.md)
- - [InlineObject3](doc//InlineObject3.md)
- - [InlineObject4](doc//InlineObject4.md)
- - [InlineObject5](doc//InlineObject5.md)
  - [InlineResponseDefault](doc//InlineResponseDefault.md)
  - [MapTest](doc//MapTest.md)
  - [MixedPropertiesAndAdditionalPropertiesClass](doc//MixedPropertiesAndAdditionalPropertiesClass.md)
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api.dart
index 36b0ba50ea8..3563dcbfc00 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api.dart
@@ -55,12 +55,6 @@ part 'model/foo.dart';
 part 'model/format_test.dart';
 part 'model/has_only_read_only.dart';
 part 'model/health_check_result.dart';
-part 'model/inline_object.dart';
-part 'model/inline_object1.dart';
-part 'model/inline_object2.dart';
-part 'model/inline_object3.dart';
-part 'model/inline_object4.dart';
-part 'model/inline_object5.dart';
 part 'model/inline_response_default.dart';
 part 'model/map_test.dart';
 part 'model/mixed_properties_and_additional_properties_class.dart';
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api_client.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api_client.dart
index c1fe27914fe..22d45db938d 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api_client.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api_client.dart
@@ -206,18 +206,6 @@ class ApiClient {
           return HasOnlyReadOnly.fromJson(value);
         case 'HealthCheckResult':
           return HealthCheckResult.fromJson(value);
-        case 'InlineObject':
-          return InlineObject.fromJson(value);
-        case 'InlineObject1':
-          return InlineObject1.fromJson(value);
-        case 'InlineObject2':
-          return InlineObject2.fromJson(value);
-        case 'InlineObject3':
-          return InlineObject3.fromJson(value);
-        case 'InlineObject4':
-          return InlineObject4.fromJson(value);
-        case 'InlineObject5':
-          return InlineObject5.fromJson(value);
         case 'InlineResponseDefault':
           return InlineResponseDefault.fromJson(value);
         case 'MapTest':
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/inline_object1_test.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/inline_object1_test.dart
deleted file mode 100644
index 0ee5baa0570..00000000000
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/inline_object1_test.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-import 'package:openapi/api.dart';
-import 'package:test/test.dart';
-
-// tests for InlineObject1
-void main() {
-  final instance = InlineObject1();
-
-  group('test InlineObject1', () {
-    // Additional data to pass to server
-    // String additionalMetadata
-    test('to test the property `additionalMetadata`', () async {
-      // TODO
-    });
-
-    // file to upload
-    // MultipartFile file
-    test('to test the property `file`', () async {
-      // TODO
-    });
-
-
-  });
-
-}
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/inline_object2_test.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/inline_object2_test.dart
deleted file mode 100644
index 0d2ee346dc4..00000000000
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/inline_object2_test.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-import 'package:openapi/api.dart';
-import 'package:test/test.dart';
-
-// tests for InlineObject2
-void main() {
-  final instance = InlineObject2();
-
-  group('test InlineObject2', () {
-    // Form parameter enum test (string array)
-    // List<String> enumFormStringArray (default value: const [])
-    test('to test the property `enumFormStringArray`', () async {
-      // TODO
-    });
-
-    // Form parameter enum test (string)
-    // String enumFormString (default value: '-efg')
-    test('to test the property `enumFormString`', () async {
-      // TODO
-    });
-
-
-  });
-
-}
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/inline_object3_test.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/inline_object3_test.dart
deleted file mode 100644
index f6eba956c09..00000000000
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/inline_object3_test.dart
+++ /dev/null
@@ -1,96 +0,0 @@
-import 'package:openapi/api.dart';
-import 'package:test/test.dart';
-
-// tests for InlineObject3
-void main() {
-  final instance = InlineObject3();
-
-  group('test InlineObject3', () {
-    // None
-    // int integer
-    test('to test the property `integer`', () async {
-      // TODO
-    });
-
-    // None
-    // int int32
-    test('to test the property `int32`', () async {
-      // TODO
-    });
-
-    // None
-    // int int64
-    test('to test the property `int64`', () async {
-      // TODO
-    });
-
-    // None
-    // num number
-    test('to test the property `number`', () async {
-      // TODO
-    });
-
-    // None
-    // double float
-    test('to test the property `float`', () async {
-      // TODO
-    });
-
-    // None
-    // double double_
-    test('to test the property `double_`', () async {
-      // TODO
-    });
-
-    // None
-    // String string
-    test('to test the property `string`', () async {
-      // TODO
-    });
-
-    // None
-    // String patternWithoutDelimiter
-    test('to test the property `patternWithoutDelimiter`', () async {
-      // TODO
-    });
-
-    // None
-    // String byte
-    test('to test the property `byte`', () async {
-      // TODO
-    });
-
-    // None
-    // MultipartFile binary
-    test('to test the property `binary`', () async {
-      // TODO
-    });
-
-    // None
-    // DateTime date
-    test('to test the property `date`', () async {
-      // TODO
-    });
-
-    // None
-    // DateTime dateTime
-    test('to test the property `dateTime`', () async {
-      // TODO
-    });
-
-    // None
-    // String password
-    test('to test the property `password`', () async {
-      // TODO
-    });
-
-    // None
-    // String callback
-    test('to test the property `callback`', () async {
-      // TODO
-    });
-
-
-  });
-
-}
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/inline_object4_test.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/inline_object4_test.dart
deleted file mode 100644
index 16cd24fa7a6..00000000000
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/inline_object4_test.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-import 'package:openapi/api.dart';
-import 'package:test/test.dart';
-
-// tests for InlineObject4
-void main() {
-  final instance = InlineObject4();
-
-  group('test InlineObject4', () {
-    // field1
-    // String param
-    test('to test the property `param`', () async {
-      // TODO
-    });
-
-    // field2
-    // String param2
-    test('to test the property `param2`', () async {
-      // TODO
-    });
-
-
-  });
-
-}
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/inline_object5_test.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/inline_object5_test.dart
deleted file mode 100644
index 23af247e903..00000000000
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/inline_object5_test.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-import 'package:openapi/api.dart';
-import 'package:test/test.dart';
-
-// tests for InlineObject5
-void main() {
-  final instance = InlineObject5();
-
-  group('test InlineObject5', () {
-    // Additional data to pass to server
-    // String additionalMetadata
-    test('to test the property `additionalMetadata`', () async {
-      // TODO
-    });
-
-    // file to upload
-    // MultipartFile requiredFile
-    test('to test the property `requiredFile`', () async {
-      // TODO
-    });
-
-
-  });
-
-}
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/inline_object_test.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/inline_object_test.dart
deleted file mode 100644
index f340e52b1d6..00000000000
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/inline_object_test.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-import 'package:openapi/api.dart';
-import 'package:test/test.dart';
-
-// tests for InlineObject
-void main() {
-  final instance = InlineObject();
-
-  group('test InlineObject', () {
-    // Updated name of the pet
-    // String name
-    test('to test the property `name`', () async {
-      // TODO
-    });
-
-    // Updated status of the pet
-    // String status
-    test('to test the property `status`', () async {
-      // TODO
-    });
-
-
-  });
-
-}
diff --git a/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/FILES b/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/FILES
index c90528f4b27..cf7e61f6e52 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/FILES
@@ -45,12 +45,6 @@ docs/FruitReq.md
 docs/GmFruit.md
 docs/HasOnlyReadOnly.md
 docs/HealthCheckResult.md
-docs/InlineObject.md
-docs/InlineObject1.md
-docs/InlineObject2.md
-docs/InlineObject3.md
-docs/InlineObject4.md
-docs/InlineObject5.md
 docs/InlineResponseDefault.md
 docs/List.md
 docs/Mammal.md
@@ -112,12 +106,6 @@ model_fruit_req.go
 model_gm_fruit.go
 model_has_only_read_only.go
 model_health_check_result.go
-model_inline_object.go
-model_inline_object_1.go
-model_inline_object_2.go
-model_inline_object_3.go
-model_inline_object_4.go
-model_inline_object_5.go
 model_inline_response_default.go
 model_list.go
 model_mammal.go
diff --git a/samples/openapi3/client/petstore/go/go-petstore/README.md b/samples/openapi3/client/petstore/go/go-petstore/README.md
index d962c517785..d09a686f837 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/README.md
+++ b/samples/openapi3/client/petstore/go/go-petstore/README.md
@@ -150,12 +150,6 @@ Class | Method | HTTP request | Description
  - [GmFruit](docs/GmFruit.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [HealthCheckResult](docs/HealthCheckResult.md)
- - [InlineObject](docs/InlineObject.md)
- - [InlineObject1](docs/InlineObject1.md)
- - [InlineObject2](docs/InlineObject2.md)
- - [InlineObject3](docs/InlineObject3.md)
- - [InlineObject4](docs/InlineObject4.md)
- - [InlineObject5](docs/InlineObject5.md)
  - [InlineResponseDefault](docs/InlineResponseDefault.md)
  - [List](docs/List.md)
  - [Mammal](docs/Mammal.md)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/.openapi-generator/FILES b/samples/openapi3/client/petstore/java/jersey2-java8/.openapi-generator/FILES
index 042f47d42d8..60a20b5ae5d 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/.openapi-generator/FILES
@@ -44,12 +44,6 @@ docs/GmFruit.md
 docs/GrandparentAnimal.md
 docs/HasOnlyReadOnly.md
 docs/HealthCheckResult.md
-docs/InlineObject.md
-docs/InlineObject1.md
-docs/InlineObject2.md
-docs/InlineObject3.md
-docs/InlineObject4.md
-docs/InlineObject5.md
 docs/InlineResponseDefault.md
 docs/IsoscelesTriangle.md
 docs/Mammal.md
@@ -160,12 +154,6 @@ src/main/java/org/openapitools/client/model/GmFruit.java
 src/main/java/org/openapitools/client/model/GrandparentAnimal.java
 src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
 src/main/java/org/openapitools/client/model/HealthCheckResult.java
-src/main/java/org/openapitools/client/model/InlineObject.java
-src/main/java/org/openapitools/client/model/InlineObject1.java
-src/main/java/org/openapitools/client/model/InlineObject2.java
-src/main/java/org/openapitools/client/model/InlineObject3.java
-src/main/java/org/openapitools/client/model/InlineObject4.java
-src/main/java/org/openapitools/client/model/InlineObject5.java
 src/main/java/org/openapitools/client/model/InlineResponseDefault.java
 src/main/java/org/openapitools/client/model/IsoscelesTriangle.java
 src/main/java/org/openapitools/client/model/Mammal.java
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/README.md b/samples/openapi3/client/petstore/java/jersey2-java8/README.md
index fdca66069f2..2a454962f97 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/README.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/README.md
@@ -210,12 +210,6 @@ Class | Method | HTTP request | Description
  - [GrandparentAnimal](docs/GrandparentAnimal.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [HealthCheckResult](docs/HealthCheckResult.md)
- - [InlineObject](docs/InlineObject.md)
- - [InlineObject1](docs/InlineObject1.md)
- - [InlineObject2](docs/InlineObject2.md)
- - [InlineObject3](docs/InlineObject3.md)
- - [InlineObject4](docs/InlineObject4.md)
- - [InlineObject5](docs/InlineObject5.md)
  - [InlineResponseDefault](docs/InlineResponseDefault.md)
  - [IsoscelesTriangle](docs/IsoscelesTriangle.md)
  - [Mammal](docs/Mammal.md)
diff --git a/samples/openapi3/client/petstore/java/native/.openapi-generator/FILES b/samples/openapi3/client/petstore/java/native/.openapi-generator/FILES
index 897010e5f87..8227977016f 100644
--- a/samples/openapi3/client/petstore/java/native/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/java/native/.openapi-generator/FILES
@@ -44,12 +44,6 @@ docs/GmFruit.md
 docs/GrandparentAnimal.md
 docs/HasOnlyReadOnly.md
 docs/HealthCheckResult.md
-docs/InlineObject.md
-docs/InlineObject1.md
-docs/InlineObject2.md
-docs/InlineObject3.md
-docs/InlineObject4.md
-docs/InlineObject5.md
 docs/InlineResponseDefault.md
 docs/IsoscelesTriangle.md
 docs/Mammal.md
@@ -151,12 +145,6 @@ src/main/java/org/openapitools/client/model/GmFruit.java
 src/main/java/org/openapitools/client/model/GrandparentAnimal.java
 src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
 src/main/java/org/openapitools/client/model/HealthCheckResult.java
-src/main/java/org/openapitools/client/model/InlineObject.java
-src/main/java/org/openapitools/client/model/InlineObject1.java
-src/main/java/org/openapitools/client/model/InlineObject2.java
-src/main/java/org/openapitools/client/model/InlineObject3.java
-src/main/java/org/openapitools/client/model/InlineObject4.java
-src/main/java/org/openapitools/client/model/InlineObject5.java
 src/main/java/org/openapitools/client/model/InlineResponseDefault.java
 src/main/java/org/openapitools/client/model/IsoscelesTriangle.java
 src/main/java/org/openapitools/client/model/Mammal.java
diff --git a/samples/openapi3/client/petstore/java/native/README.md b/samples/openapi3/client/petstore/java/native/README.md
index 96c6c6ce56b..cffa9c01a4d 100644
--- a/samples/openapi3/client/petstore/java/native/README.md
+++ b/samples/openapi3/client/petstore/java/native/README.md
@@ -223,12 +223,6 @@ Class | Method | HTTP request | Description
  - [GrandparentAnimal](docs/GrandparentAnimal.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [HealthCheckResult](docs/HealthCheckResult.md)
- - [InlineObject](docs/InlineObject.md)
- - [InlineObject1](docs/InlineObject1.md)
- - [InlineObject2](docs/InlineObject2.md)
- - [InlineObject3](docs/InlineObject3.md)
- - [InlineObject4](docs/InlineObject4.md)
- - [InlineObject5](docs/InlineObject5.md)
  - [InlineResponseDefault](docs/InlineResponseDefault.md)
  - [IsoscelesTriangle](docs/IsoscelesTriangle.md)
  - [Mammal](docs/Mammal.md)
diff --git a/samples/openapi3/client/petstore/python-legacy/.openapi-generator/FILES b/samples/openapi3/client/petstore/python-legacy/.openapi-generator/FILES
index 1607b2b462b..50dd7b24b7a 100755
--- a/samples/openapi3/client/petstore/python-legacy/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/python-legacy/.openapi-generator/FILES
@@ -29,12 +29,6 @@ docs/Foo.md
 docs/FormatTest.md
 docs/HasOnlyReadOnly.md
 docs/HealthCheckResult.md
-docs/InlineObject.md
-docs/InlineObject1.md
-docs/InlineObject2.md
-docs/InlineObject3.md
-docs/InlineObject4.md
-docs/InlineObject5.md
 docs/InlineResponseDefault.md
 docs/List.md
 docs/MapTest.md
@@ -95,12 +89,6 @@ petstore_api/models/foo.py
 petstore_api/models/format_test.py
 petstore_api/models/has_only_read_only.py
 petstore_api/models/health_check_result.py
-petstore_api/models/inline_object.py
-petstore_api/models/inline_object1.py
-petstore_api/models/inline_object2.py
-petstore_api/models/inline_object3.py
-petstore_api/models/inline_object4.py
-petstore_api/models/inline_object5.py
 petstore_api/models/inline_response_default.py
 petstore_api/models/list.py
 petstore_api/models/map_test.py
diff --git a/samples/openapi3/client/petstore/python-legacy/README.md b/samples/openapi3/client/petstore/python-legacy/README.md
index 801d1515cea..4d8a7194aa8 100755
--- a/samples/openapi3/client/petstore/python-legacy/README.md
+++ b/samples/openapi3/client/petstore/python-legacy/README.md
@@ -147,12 +147,6 @@ Class | Method | HTTP request | Description
  - [FormatTest](docs/FormatTest.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [HealthCheckResult](docs/HealthCheckResult.md)
- - [InlineObject](docs/InlineObject.md)
- - [InlineObject1](docs/InlineObject1.md)
- - [InlineObject2](docs/InlineObject2.md)
- - [InlineObject3](docs/InlineObject3.md)
- - [InlineObject4](docs/InlineObject4.md)
- - [InlineObject5](docs/InlineObject5.md)
  - [InlineResponseDefault](docs/InlineResponseDefault.md)
  - [List](docs/List.md)
  - [MapTest](docs/MapTest.md)
diff --git a/samples/openapi3/client/petstore/python-legacy/petstore_api/__init__.py b/samples/openapi3/client/petstore/python-legacy/petstore_api/__init__.py
index 8a91e73ea15..0625babbb66 100755
--- a/samples/openapi3/client/petstore/python-legacy/petstore_api/__init__.py
+++ b/samples/openapi3/client/petstore/python-legacy/petstore_api/__init__.py
@@ -58,12 +58,6 @@ from petstore_api.models.foo import Foo
 from petstore_api.models.format_test import FormatTest
 from petstore_api.models.has_only_read_only import HasOnlyReadOnly
 from petstore_api.models.health_check_result import HealthCheckResult
-from petstore_api.models.inline_object import InlineObject
-from petstore_api.models.inline_object1 import InlineObject1
-from petstore_api.models.inline_object2 import InlineObject2
-from petstore_api.models.inline_object3 import InlineObject3
-from petstore_api.models.inline_object4 import InlineObject4
-from petstore_api.models.inline_object5 import InlineObject5
 from petstore_api.models.inline_response_default import InlineResponseDefault
 from petstore_api.models.list import List
 from petstore_api.models.map_test import MapTest
diff --git a/samples/openapi3/client/petstore/python-legacy/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python-legacy/petstore_api/models/__init__.py
index f11ff62b2ee..d24bf127f02 100755
--- a/samples/openapi3/client/petstore/python-legacy/petstore_api/models/__init__.py
+++ b/samples/openapi3/client/petstore/python-legacy/petstore_api/models/__init__.py
@@ -37,12 +37,6 @@ from petstore_api.models.foo import Foo
 from petstore_api.models.format_test import FormatTest
 from petstore_api.models.has_only_read_only import HasOnlyReadOnly
 from petstore_api.models.health_check_result import HealthCheckResult
-from petstore_api.models.inline_object import InlineObject
-from petstore_api.models.inline_object1 import InlineObject1
-from petstore_api.models.inline_object2 import InlineObject2
-from petstore_api.models.inline_object3 import InlineObject3
-from petstore_api.models.inline_object4 import InlineObject4
-from petstore_api.models.inline_object5 import InlineObject5
 from petstore_api.models.inline_response_default import InlineResponseDefault
 from petstore_api.models.list import List
 from petstore_api.models.map_test import MapTest
diff --git a/samples/openapi3/client/petstore/python/.openapi-generator/FILES b/samples/openapi3/client/petstore/python/.openapi-generator/FILES
index 0629661274d..34b36c49f8b 100644
--- a/samples/openapi3/client/petstore/python/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/python/.openapi-generator/FILES
@@ -49,12 +49,6 @@ docs/GmFruit.md
 docs/GrandparentAnimal.md
 docs/HasOnlyReadOnly.md
 docs/HealthCheckResult.md
-docs/InlineObject.md
-docs/InlineObject1.md
-docs/InlineObject2.md
-docs/InlineObject3.md
-docs/InlineObject4.md
-docs/InlineObject5.md
 docs/InlineResponseDefault.md
 docs/IntegerEnum.md
 docs/IntegerEnumOneValue.md
@@ -158,12 +152,6 @@ petstore_api/model/gm_fruit.py
 petstore_api/model/grandparent_animal.py
 petstore_api/model/has_only_read_only.py
 petstore_api/model/health_check_result.py
-petstore_api/model/inline_object.py
-petstore_api/model/inline_object1.py
-petstore_api/model/inline_object2.py
-petstore_api/model/inline_object3.py
-petstore_api/model/inline_object4.py
-petstore_api/model/inline_object5.py
 petstore_api/model/inline_response_default.py
 petstore_api/model/integer_enum.py
 petstore_api/model/integer_enum_one_value.py
diff --git a/samples/openapi3/client/petstore/python/README.md b/samples/openapi3/client/petstore/python/README.md
index 2b83a263210..9f9fb246b27 100644
--- a/samples/openapi3/client/petstore/python/README.md
+++ b/samples/openapi3/client/petstore/python/README.md
@@ -172,12 +172,6 @@ Class | Method | HTTP request | Description
  - [GrandparentAnimal](docs/GrandparentAnimal.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [HealthCheckResult](docs/HealthCheckResult.md)
- - [InlineObject](docs/InlineObject.md)
- - [InlineObject1](docs/InlineObject1.md)
- - [InlineObject2](docs/InlineObject2.md)
- - [InlineObject3](docs/InlineObject3.md)
- - [InlineObject4](docs/InlineObject4.md)
- - [InlineObject5](docs/InlineObject5.md)
  - [InlineResponseDefault](docs/InlineResponseDefault.md)
  - [IntegerEnum](docs/IntegerEnum.md)
  - [IntegerEnumOneValue](docs/IntegerEnumOneValue.md)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/models/__init__.py
index 32f0804f578..4941dc7de6e 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/__init__.py
@@ -52,12 +52,6 @@ from petstore_api.model.gm_fruit import GmFruit
 from petstore_api.model.grandparent_animal import GrandparentAnimal
 from petstore_api.model.has_only_read_only import HasOnlyReadOnly
 from petstore_api.model.health_check_result import HealthCheckResult
-from petstore_api.model.inline_object import InlineObject
-from petstore_api.model.inline_object1 import InlineObject1
-from petstore_api.model.inline_object2 import InlineObject2
-from petstore_api.model.inline_object3 import InlineObject3
-from petstore_api.model.inline_object4 import InlineObject4
-from petstore_api.model.inline_object5 import InlineObject5
 from petstore_api.model.inline_response_default import InlineResponseDefault
 from petstore_api.model.integer_enum import IntegerEnum
 from petstore_api.model.integer_enum_one_value import IntegerEnumOneValue
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator/FILES b/samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator/FILES
index d21a391e008..29f9ff544d9 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator/FILES
@@ -14,8 +14,6 @@ index.ts
 middleware.ts
 models/ApiResponse.ts
 models/Category.ts
-models/InlineObject.ts
-models/InlineObject1.ts
 models/ObjectSerializer.ts
 models/Order.ts
 models/Pet.ts
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/models/ObjectSerializer.ts b/samples/openapi3/client/petstore/typescript/builds/default/models/ObjectSerializer.ts
index 338b4e481fd..57201945fc8 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/models/ObjectSerializer.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/models/ObjectSerializer.ts
@@ -1,7 +1,5 @@
 export * from './ApiResponse';
 export * from './Category';
-export * from './InlineObject';
-export * from './InlineObject1';
 export * from './Order';
 export * from './Pet';
 export * from './Tag';
@@ -9,8 +7,6 @@ export * from './User';
 
 import { ApiResponse } from './ApiResponse';
 import { Category } from './Category';
-import { InlineObject } from './InlineObject';
-import { InlineObject1 } from './InlineObject1';
 import { Order    , OrderStatusEnum    } from './Order';
 import { Pet     , PetStatusEnum   } from './Pet';
 import { Tag } from './Tag';
@@ -42,8 +38,6 @@ let enumsMap: Set<string> = new Set<string>([
 let typeMap: {[index: string]: any} = {
     "ApiResponse": ApiResponse,
     "Category": Category,
-    "InlineObject": InlineObject,
-    "InlineObject1": InlineObject1,
     "Order": Order,
     "Pet": Pet,
     "Tag": Tag,
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/models/all.ts b/samples/openapi3/client/petstore/typescript/builds/default/models/all.ts
index d064eba93ab..2edba7f0bd5 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/models/all.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/models/all.ts
@@ -1,7 +1,5 @@
 export * from './ApiResponse'
 export * from './Category'
-export * from './InlineObject'
-export * from './InlineObject1'
 export * from './Order'
 export * from './Pet'
 export * from './Tag'
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/default/types/ObjectParamAPI.ts
index 10cebbd77dd..bcc9c5afa0a 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/types/ObjectParamAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/types/ObjectParamAPI.ts
@@ -4,8 +4,6 @@ import { Configuration} from '../configuration'
 
 import { ApiResponse } from '../models/ApiResponse';
 import { Category } from '../models/Category';
-import { InlineObject } from '../models/InlineObject';
-import { InlineObject1 } from '../models/InlineObject1';
 import { Order } from '../models/Order';
 import { Pet } from '../models/Pet';
 import { Tag } from '../models/Tag';
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/default/types/ObservableAPI.ts
index 30be6fff1f8..6154d267ed3 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/types/ObservableAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/types/ObservableAPI.ts
@@ -6,8 +6,6 @@ import {mergeMap, map} from  '../rxjsStub';
 
 import { ApiResponse } from '../models/ApiResponse';
 import { Category } from '../models/Category';
-import { InlineObject } from '../models/InlineObject';
-import { InlineObject1 } from '../models/InlineObject1';
 import { Order } from '../models/Order';
 import { Pet } from '../models/Pet';
 import { Tag } from '../models/Tag';
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/default/types/PromiseAPI.ts
index 44829ca43fa..533095a405d 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/types/PromiseAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/types/PromiseAPI.ts
@@ -4,8 +4,6 @@ import { Configuration} from '../configuration'
 
 import { ApiResponse } from '../models/ApiResponse';
 import { Category } from '../models/Category';
-import { InlineObject } from '../models/InlineObject';
-import { InlineObject1 } from '../models/InlineObject1';
 import { Order } from '../models/Order';
 import { Pet } from '../models/Pet';
 import { Tag } from '../models/Tag';
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/.openapi-generator/FILES b/samples/openapi3/client/petstore/typescript/builds/deno/.openapi-generator/FILES
index b31c76a281f..3b444ce2b10 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/.openapi-generator/FILES
@@ -13,8 +13,6 @@ index.ts
 middleware.ts
 models/ApiResponse.ts
 models/Category.ts
-models/InlineObject.ts
-models/InlineObject1.ts
 models/ObjectSerializer.ts
 models/Order.ts
 models/Pet.ts
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/models/ObjectSerializer.ts b/samples/openapi3/client/petstore/typescript/builds/deno/models/ObjectSerializer.ts
index 15f4f89bfaa..858a4b6e0dc 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/models/ObjectSerializer.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/models/ObjectSerializer.ts
@@ -1,7 +1,5 @@
 export * from './ApiResponse.ts';
 export * from './Category.ts';
-export * from './InlineObject.ts';
-export * from './InlineObject1.ts';
 export * from './Order.ts';
 export * from './Pet.ts';
 export * from './Tag.ts';
@@ -9,8 +7,6 @@ export * from './User.ts';
 
 import { ApiResponse } from './ApiResponse.ts';
 import { Category } from './Category.ts';
-import { InlineObject } from './InlineObject.ts';
-import { InlineObject1 } from './InlineObject1.ts';
 import { Order    , OrderStatusEnum    } from './Order.ts';
 import { Pet     , PetStatusEnum   } from './Pet.ts';
 import { Tag } from './Tag.ts';
@@ -42,8 +38,6 @@ let enumsMap: Set<string> = new Set<string>([
 let typeMap: {[index: string]: any} = {
     "ApiResponse": ApiResponse,
     "Category": Category,
-    "InlineObject": InlineObject,
-    "InlineObject1": InlineObject1,
     "Order": Order,
     "Pet": Pet,
     "Tag": Tag,
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/models/all.ts b/samples/openapi3/client/petstore/typescript/builds/deno/models/all.ts
index 349080a7208..e77f63aa4be 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/models/all.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/models/all.ts
@@ -1,7 +1,5 @@
 export * from './ApiResponse.ts'
 export * from './Category.ts'
-export * from './InlineObject.ts'
-export * from './InlineObject1.ts'
 export * from './Order.ts'
 export * from './Pet.ts'
 export * from './Tag.ts'
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/deno/types/ObjectParamAPI.ts
index b6703599614..6c05a844b2c 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/types/ObjectParamAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/types/ObjectParamAPI.ts
@@ -4,8 +4,6 @@ import { Configuration} from '../configuration.ts'
 
 import { ApiResponse } from '../models/ApiResponse.ts';
 import { Category } from '../models/Category.ts';
-import { InlineObject } from '../models/InlineObject.ts';
-import { InlineObject1 } from '../models/InlineObject1.ts';
 import { Order } from '../models/Order.ts';
 import { Pet } from '../models/Pet.ts';
 import { Tag } from '../models/Tag.ts';
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/deno/types/ObservableAPI.ts
index c9c5604992c..0b4531f7584 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/types/ObservableAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/types/ObservableAPI.ts
@@ -6,8 +6,6 @@ import {mergeMap, map} from  '../rxjsStub.ts';
 
 import { ApiResponse } from '../models/ApiResponse.ts';
 import { Category } from '../models/Category.ts';
-import { InlineObject } from '../models/InlineObject.ts';
-import { InlineObject1 } from '../models/InlineObject1.ts';
 import { Order } from '../models/Order.ts';
 import { Pet } from '../models/Pet.ts';
 import { Tag } from '../models/Tag.ts';
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/deno/types/PromiseAPI.ts
index ea458404f92..4c44a104094 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/types/PromiseAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/types/PromiseAPI.ts
@@ -4,8 +4,6 @@ import { Configuration} from '../configuration.ts'
 
 import { ApiResponse } from '../models/ApiResponse.ts';
 import { Category } from '../models/Category.ts';
-import { InlineObject } from '../models/InlineObject.ts';
-import { InlineObject1 } from '../models/InlineObject1.ts';
 import { Order } from '../models/Order.ts';
 import { Pet } from '../models/Pet.ts';
 import { Tag } from '../models/Tag.ts';
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/.openapi-generator/FILES b/samples/openapi3/client/petstore/typescript/builds/inversify/.openapi-generator/FILES
index d580da4ce9e..4f2382c7e38 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/.openapi-generator/FILES
@@ -17,8 +17,6 @@ index.ts
 middleware.ts
 models/ApiResponse.ts
 models/Category.ts
-models/InlineObject.ts
-models/InlineObject1.ts
 models/ObjectSerializer.ts
 models/Order.ts
 models/Pet.ts
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/models/ObjectSerializer.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/models/ObjectSerializer.ts
index 338b4e481fd..57201945fc8 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/models/ObjectSerializer.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/models/ObjectSerializer.ts
@@ -1,7 +1,5 @@
 export * from './ApiResponse';
 export * from './Category';
-export * from './InlineObject';
-export * from './InlineObject1';
 export * from './Order';
 export * from './Pet';
 export * from './Tag';
@@ -9,8 +7,6 @@ export * from './User';
 
 import { ApiResponse } from './ApiResponse';
 import { Category } from './Category';
-import { InlineObject } from './InlineObject';
-import { InlineObject1 } from './InlineObject1';
 import { Order    , OrderStatusEnum    } from './Order';
 import { Pet     , PetStatusEnum   } from './Pet';
 import { Tag } from './Tag';
@@ -42,8 +38,6 @@ let enumsMap: Set<string> = new Set<string>([
 let typeMap: {[index: string]: any} = {
     "ApiResponse": ApiResponse,
     "Category": Category,
-    "InlineObject": InlineObject,
-    "InlineObject1": InlineObject1,
     "Order": Order,
     "Pet": Pet,
     "Tag": Tag,
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/models/all.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/models/all.ts
index d064eba93ab..2edba7f0bd5 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/models/all.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/models/all.ts
@@ -1,7 +1,5 @@
 export * from './ApiResponse'
 export * from './Category'
-export * from './InlineObject'
-export * from './InlineObject1'
 export * from './Order'
 export * from './Pet'
 export * from './Tag'
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/services/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/services/ObjectParamAPI.ts
index c3bff4dceea..d0cdd02e78d 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/services/ObjectParamAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/services/ObjectParamAPI.ts
@@ -4,8 +4,6 @@ import type * as req from "../types/ObjectParamAPI";
 
 import type { ApiResponse } from '../models/ApiResponse';
 import type { Category } from '../models/Category';
-import type { InlineObject } from '../models/InlineObject';
-import type { InlineObject1 } from '../models/InlineObject1';
 import type { Order } from '../models/Order';
 import type { Pet } from '../models/Pet';
 import type { Tag } from '../models/Tag';
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/services/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/services/ObservableAPI.ts
index 346900cc554..014636645ab 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/services/ObservableAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/services/ObservableAPI.ts
@@ -4,8 +4,6 @@ import type { Configuration } from "../configuration";
 
 import { ApiResponse } from "../models/ApiResponse";
 import { Category } from "../models/Category";
-import { InlineObject } from "../models/InlineObject";
-import { InlineObject1 } from "../models/InlineObject1";
 import { Order } from "../models/Order";
 import { Pet } from "../models/Pet";
 import { Tag } from "../models/Tag";
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/services/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/services/PromiseAPI.ts
index 365741814d3..121ef651dae 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/services/PromiseAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/services/PromiseAPI.ts
@@ -3,8 +3,6 @@ import type { Configuration } from "../configuration";
 
 import { ApiResponse } from "../models/ApiResponse";
 import { Category } from "../models/Category";
-import { InlineObject } from "../models/InlineObject";
-import { InlineObject1 } from "../models/InlineObject1";
 import { Order } from "../models/Order";
 import { Pet } from "../models/Pet";
 import { Tag } from "../models/Tag";
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObjectParamAPI.ts
index 10cebbd77dd..bcc9c5afa0a 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObjectParamAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObjectParamAPI.ts
@@ -4,8 +4,6 @@ import { Configuration} from '../configuration'
 
 import { ApiResponse } from '../models/ApiResponse';
 import { Category } from '../models/Category';
-import { InlineObject } from '../models/InlineObject';
-import { InlineObject1 } from '../models/InlineObject1';
 import { Order } from '../models/Order';
 import { Pet } from '../models/Pet';
 import { Tag } from '../models/Tag';
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts
index 58b8d97c3e0..31ced8bbdca 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts
@@ -8,8 +8,6 @@ import { AbstractConfiguration } from "../services/configuration";
 
 import { ApiResponse } from '../models/ApiResponse';
 import { Category } from '../models/Category';
-import { InlineObject } from '../models/InlineObject';
-import { InlineObject1 } from '../models/InlineObject1';
 import { Order } from '../models/Order';
 import { Pet } from '../models/Pet';
 import { Tag } from '../models/Tag';
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/types/PromiseAPI.ts
index 7719a5f77b3..6077fdac2d5 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/types/PromiseAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/types/PromiseAPI.ts
@@ -6,8 +6,6 @@ import { AbstractConfiguration } from "../services/configuration";
 
 import { ApiResponse } from '../models/ApiResponse';
 import { Category } from '../models/Category';
-import { InlineObject } from '../models/InlineObject';
-import { InlineObject1 } from '../models/InlineObject1';
 import { Order } from '../models/Order';
 import { Pet } from '../models/Pet';
 import { Tag } from '../models/Tag';
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator/FILES b/samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator/FILES
index 71820af41a4..031c2957055 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator/FILES
@@ -14,8 +14,6 @@ index.ts
 middleware.ts
 models/ApiResponse.ts
 models/Category.ts
-models/InlineObject.ts
-models/InlineObject1.ts
 models/ObjectSerializer.ts
 models/Order.ts
 models/Pet.ts
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/models/ObjectSerializer.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/models/ObjectSerializer.ts
index 338b4e481fd..57201945fc8 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/models/ObjectSerializer.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/models/ObjectSerializer.ts
@@ -1,7 +1,5 @@
 export * from './ApiResponse';
 export * from './Category';
-export * from './InlineObject';
-export * from './InlineObject1';
 export * from './Order';
 export * from './Pet';
 export * from './Tag';
@@ -9,8 +7,6 @@ export * from './User';
 
 import { ApiResponse } from './ApiResponse';
 import { Category } from './Category';
-import { InlineObject } from './InlineObject';
-import { InlineObject1 } from './InlineObject1';
 import { Order    , OrderStatusEnum    } from './Order';
 import { Pet     , PetStatusEnum   } from './Pet';
 import { Tag } from './Tag';
@@ -42,8 +38,6 @@ let enumsMap: Set<string> = new Set<string>([
 let typeMap: {[index: string]: any} = {
     "ApiResponse": ApiResponse,
     "Category": Category,
-    "InlineObject": InlineObject,
-    "InlineObject1": InlineObject1,
     "Order": Order,
     "Pet": Pet,
     "Tag": Tag,
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/models/all.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/models/all.ts
index d064eba93ab..2edba7f0bd5 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/models/all.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/models/all.ts
@@ -1,7 +1,5 @@
 export * from './ApiResponse'
 export * from './Category'
-export * from './InlineObject'
-export * from './InlineObject1'
 export * from './Order'
 export * from './Pet'
 export * from './Tag'
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObjectParamAPI.ts
index 10cebbd77dd..bcc9c5afa0a 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObjectParamAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObjectParamAPI.ts
@@ -4,8 +4,6 @@ import { Configuration} from '../configuration'
 
 import { ApiResponse } from '../models/ApiResponse';
 import { Category } from '../models/Category';
-import { InlineObject } from '../models/InlineObject';
-import { InlineObject1 } from '../models/InlineObject1';
 import { Order } from '../models/Order';
 import { Pet } from '../models/Pet';
 import { Tag } from '../models/Tag';
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObservableAPI.ts
index 30be6fff1f8..6154d267ed3 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObservableAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObservableAPI.ts
@@ -6,8 +6,6 @@ import {mergeMap, map} from  '../rxjsStub';
 
 import { ApiResponse } from '../models/ApiResponse';
 import { Category } from '../models/Category';
-import { InlineObject } from '../models/InlineObject';
-import { InlineObject1 } from '../models/InlineObject1';
 import { Order } from '../models/Order';
 import { Pet } from '../models/Pet';
 import { Tag } from '../models/Tag';
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/types/PromiseAPI.ts
index 44829ca43fa..533095a405d 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/types/PromiseAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/types/PromiseAPI.ts
@@ -4,8 +4,6 @@ import { Configuration} from '../configuration'
 
 import { ApiResponse } from '../models/ApiResponse';
 import { Category } from '../models/Category';
-import { InlineObject } from '../models/InlineObject';
-import { InlineObject1 } from '../models/InlineObject1';
 import { Order } from '../models/Order';
 import { Pet } from '../models/Pet';
 import { Tag } from '../models/Tag';
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator/FILES b/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator/FILES
index d21a391e008..29f9ff544d9 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator/FILES
@@ -14,8 +14,6 @@ index.ts
 middleware.ts
 models/ApiResponse.ts
 models/Category.ts
-models/InlineObject.ts
-models/InlineObject1.ts
 models/ObjectSerializer.ts
 models/Order.ts
 models/Pet.ts
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/models/ObjectSerializer.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/models/ObjectSerializer.ts
index 338b4e481fd..57201945fc8 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/models/ObjectSerializer.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/models/ObjectSerializer.ts
@@ -1,7 +1,5 @@
 export * from './ApiResponse';
 export * from './Category';
-export * from './InlineObject';
-export * from './InlineObject1';
 export * from './Order';
 export * from './Pet';
 export * from './Tag';
@@ -9,8 +7,6 @@ export * from './User';
 
 import { ApiResponse } from './ApiResponse';
 import { Category } from './Category';
-import { InlineObject } from './InlineObject';
-import { InlineObject1 } from './InlineObject1';
 import { Order    , OrderStatusEnum    } from './Order';
 import { Pet     , PetStatusEnum   } from './Pet';
 import { Tag } from './Tag';
@@ -42,8 +38,6 @@ let enumsMap: Set<string> = new Set<string>([
 let typeMap: {[index: string]: any} = {
     "ApiResponse": ApiResponse,
     "Category": Category,
-    "InlineObject": InlineObject,
-    "InlineObject1": InlineObject1,
     "Order": Order,
     "Pet": Pet,
     "Tag": Tag,
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/models/all.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/models/all.ts
index d064eba93ab..2edba7f0bd5 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/models/all.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/models/all.ts
@@ -1,7 +1,5 @@
 export * from './ApiResponse'
 export * from './Category'
-export * from './InlineObject'
-export * from './InlineObject1'
 export * from './Order'
 export * from './Pet'
 export * from './Tag'
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObjectParamAPI.ts
index 10cebbd77dd..bcc9c5afa0a 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObjectParamAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObjectParamAPI.ts
@@ -4,8 +4,6 @@ import { Configuration} from '../configuration'
 
 import { ApiResponse } from '../models/ApiResponse';
 import { Category } from '../models/Category';
-import { InlineObject } from '../models/InlineObject';
-import { InlineObject1 } from '../models/InlineObject1';
 import { Order } from '../models/Order';
 import { Pet } from '../models/Pet';
 import { Tag } from '../models/Tag';
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObservableAPI.ts
index 30be6fff1f8..6154d267ed3 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObservableAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObservableAPI.ts
@@ -6,8 +6,6 @@ import {mergeMap, map} from  '../rxjsStub';
 
 import { ApiResponse } from '../models/ApiResponse';
 import { Category } from '../models/Category';
-import { InlineObject } from '../models/InlineObject';
-import { InlineObject1 } from '../models/InlineObject1';
 import { Order } from '../models/Order';
 import { Pet } from '../models/Pet';
 import { Tag } from '../models/Tag';
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/types/PromiseAPI.ts
index 44829ca43fa..533095a405d 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/types/PromiseAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/types/PromiseAPI.ts
@@ -4,8 +4,6 @@ import { Configuration} from '../configuration'
 
 import { ApiResponse } from '../models/ApiResponse';
 import { Category } from '../models/Category';
-import { InlineObject } from '../models/InlineObject';
-import { InlineObject1 } from '../models/InlineObject1';
 import { Order } from '../models/Order';
 import { Pet } from '../models/Pet';
 import { Tag } from '../models/Tag';
diff --git a/samples/schema/petstore/mysql/.openapi-generator/FILES b/samples/schema/petstore/mysql/.openapi-generator/FILES
index 5a7404b623d..5902ce6da7e 100644
--- a/samples/schema/petstore/mysql/.openapi-generator/FILES
+++ b/samples/schema/petstore/mysql/.openapi-generator/FILES
@@ -22,12 +22,6 @@ Model/Foo.sql
 Model/FormatTest.sql
 Model/HasOnlyReadOnly.sql
 Model/HealthCheckResult.sql
-Model/InlineObject.sql
-Model/InlineObject1.sql
-Model/InlineObject2.sql
-Model/InlineObject3.sql
-Model/InlineObject4.sql
-Model/InlineObject5.sql
 Model/InlineResponseDefault.sql
 Model/List.sql
 Model/MapTest.sql
diff --git a/samples/schema/petstore/mysql/mysql_schema.sql b/samples/schema/petstore/mysql/mysql_schema.sql
index f1f6f328a1b..e2cb414ed44 100644
--- a/samples/schema/petstore/mysql/mysql_schema.sql
+++ b/samples/schema/petstore/mysql/mysql_schema.sql
@@ -235,72 +235,6 @@ CREATE TABLE IF NOT EXISTS `HealthCheckResult` (
   `NullableMessage` TEXT DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.';
 
---
--- Table structure for table `inline_object` generated from model 'inlineUnderscoreobject'
---
-
-CREATE TABLE IF NOT EXISTS `inline_object` (
-  `name` TEXT DEFAULT NULL COMMENT 'Updated name of the pet',
-  `status` TEXT DEFAULT NULL COMMENT 'Updated status of the pet'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-
---
--- Table structure for table `inline_object_1` generated from model 'inlineUnderscoreobjectUnderscore1'
---
-
-CREATE TABLE IF NOT EXISTS `inline_object_1` (
-  `additionalMetadata` TEXT DEFAULT NULL COMMENT 'Additional data to pass to server',
-  `file` MEDIUMBLOB DEFAULT NULL COMMENT 'file to upload'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-
---
--- Table structure for table `inline_object_2` generated from model 'inlineUnderscoreobjectUnderscore2'
---
-
-CREATE TABLE IF NOT EXISTS `inline_object_2` (
-  `enum_form_string_array` JSON DEFAULT NULL COMMENT 'Form parameter enum test (string array)',
-  `enum_form_string` ENUM('_abc', '-efg', '(xyz)') DEFAULT '-efg' COMMENT 'Form parameter enum test (string)'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-
---
--- Table structure for table `inline_object_3` generated from model 'inlineUnderscoreobjectUnderscore3'
---
-
-CREATE TABLE IF NOT EXISTS `inline_object_3` (
-  `integer` TINYINT UNSIGNED DEFAULT NULL COMMENT 'None',
-  `int32` TINYINT UNSIGNED DEFAULT NULL COMMENT 'None',
-  `int64` BIGINT DEFAULT NULL COMMENT 'None',
-  `number` DECIMAL(20, 9) UNSIGNED NOT NULL COMMENT 'None',
-  `float` DECIMAL(20, 9) DEFAULT NULL COMMENT 'None',
-  `double` DECIMAL(20, 9) UNSIGNED NOT NULL COMMENT 'None',
-  `string` TEXT DEFAULT NULL COMMENT 'None',
-  `pattern_without_delimiter` TEXT NOT NULL COMMENT 'None',
-  `byte` MEDIUMBLOB NOT NULL COMMENT 'None',
-  `binary` MEDIUMBLOB DEFAULT NULL COMMENT 'None',
-  `date` DATE DEFAULT NULL COMMENT 'None',
-  `dateTime` DATETIME DEFAULT NULL COMMENT 'None',
-  `password` VARCHAR(64) DEFAULT NULL COMMENT 'None',
-  `callback` TEXT DEFAULT NULL COMMENT 'None'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-
---
--- Table structure for table `inline_object_4` generated from model 'inlineUnderscoreobjectUnderscore4'
---
-
-CREATE TABLE IF NOT EXISTS `inline_object_4` (
-  `param` TEXT NOT NULL COMMENT 'field1',
-  `param2` TEXT NOT NULL COMMENT 'field2'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-
---
--- Table structure for table `inline_object_5` generated from model 'inlineUnderscoreobjectUnderscore5'
---
-
-CREATE TABLE IF NOT EXISTS `inline_object_5` (
-  `additionalMetadata` TEXT DEFAULT NULL COMMENT 'Additional data to pass to server',
-  `requiredFile` MEDIUMBLOB NOT NULL COMMENT 'file to upload'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-
 --
 -- Table structure for table `inline_response_default` generated from model 'inlineUnderscoreresponseUnderscoredefault'
 --
diff --git a/samples/server/petstore/go-api-server/.openapi-generator/FILES b/samples/server/petstore/go-api-server/.openapi-generator/FILES
index 2fe863dc7ff..9135763258f 100644
--- a/samples/server/petstore/go-api-server/.openapi-generator/FILES
+++ b/samples/server/petstore/go-api-server/.openapi-generator/FILES
@@ -14,8 +14,6 @@ go/impl.go
 go/logger.go
 go/model_api_response.go
 go/model_category.go
-go/model_inline_object.go
-go/model_inline_object_1.go
 go/model_order.go
 go/model_pet.go
 go/model_tag.go
diff --git a/samples/server/petstore/go-gin-api-server/.openapi-generator/FILES b/samples/server/petstore/go-gin-api-server/.openapi-generator/FILES
index 3818d98f9c4..8d594bbb91b 100644
--- a/samples/server/petstore/go-gin-api-server/.openapi-generator/FILES
+++ b/samples/server/petstore/go-gin-api-server/.openapi-generator/FILES
@@ -6,8 +6,6 @@ go/api_store.go
 go/api_user.go
 go/model_api_response.go
 go/model_category.go
-go/model_inline_object.go
-go/model_inline_object_1.go
 go/model_order.go
 go/model_pet.go
 go/model_tag.go
diff --git a/samples/server/petstore/jaxrs-jersey/.openapi-generator/FILES b/samples/server/petstore/jaxrs-jersey/.openapi-generator/FILES
index 27c8ce98bbb..980f24f9067 100644
--- a/samples/server/petstore/jaxrs-jersey/.openapi-generator/FILES
+++ b/samples/server/petstore/jaxrs-jersey/.openapi-generator/FILES
@@ -42,12 +42,6 @@ src/gen/java/org/openapitools/model/Foo.java
 src/gen/java/org/openapitools/model/FormatTest.java
 src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
 src/gen/java/org/openapitools/model/HealthCheckResult.java
-src/gen/java/org/openapitools/model/InlineObject.java
-src/gen/java/org/openapitools/model/InlineObject1.java
-src/gen/java/org/openapitools/model/InlineObject2.java
-src/gen/java/org/openapitools/model/InlineObject3.java
-src/gen/java/org/openapitools/model/InlineObject4.java
-src/gen/java/org/openapitools/model/InlineObject5.java
 src/gen/java/org/openapitools/model/InlineResponseDefault.java
 src/gen/java/org/openapitools/model/MapTest.java
 src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
diff --git a/samples/server/petstore/kotlin-springboot-delegate/.openapi-generator/FILES b/samples/server/petstore/kotlin-springboot-delegate/.openapi-generator/FILES
index 7f1fed4bfbd..c02ae2405be 100644
--- a/samples/server/petstore/kotlin-springboot-delegate/.openapi-generator/FILES
+++ b/samples/server/petstore/kotlin-springboot-delegate/.openapi-generator/FILES
@@ -15,8 +15,6 @@ src/main/kotlin/org/openapitools/api/UserApi.kt
 src/main/kotlin/org/openapitools/api/UserApiController.kt
 src/main/kotlin/org/openapitools/api/UserApiDelegate.kt
 src/main/kotlin/org/openapitools/model/Category.kt
-src/main/kotlin/org/openapitools/model/InlineObject.kt
-src/main/kotlin/org/openapitools/model/InlineObject1.kt
 src/main/kotlin/org/openapitools/model/ModelApiResponse.kt
 src/main/kotlin/org/openapitools/model/Order.kt
 src/main/kotlin/org/openapitools/model/Pet.kt
diff --git a/samples/server/petstore/php-laravel/.openapi-generator/FILES b/samples/server/petstore/php-laravel/.openapi-generator/FILES
index 5cb759f0f0d..603506bb911 100644
--- a/samples/server/petstore/php-laravel/.openapi-generator/FILES
+++ b/samples/server/petstore/php-laravel/.openapi-generator/FILES
@@ -45,12 +45,6 @@ lib/app/Models/Foo.php
 lib/app/Models/FormatTest.php
 lib/app/Models/HasOnlyReadOnly.php
 lib/app/Models/HealthCheckResult.php
-lib/app/Models/InlineObject.php
-lib/app/Models/InlineObject1.php
-lib/app/Models/InlineObject2.php
-lib/app/Models/InlineObject3.php
-lib/app/Models/InlineObject4.php
-lib/app/Models/InlineObject5.php
 lib/app/Models/InlineResponseDefault.php
 lib/app/Models/MapTest.php
 lib/app/Models/MixedPropertiesAndAdditionalPropertiesClass.php
diff --git a/samples/server/petstore/php-slim4/.openapi-generator/FILES b/samples/server/petstore/php-slim4/.openapi-generator/FILES
index bc363030f7a..463e80a1257 100644
--- a/samples/server/petstore/php-slim4/.openapi-generator/FILES
+++ b/samples/server/petstore/php-slim4/.openapi-generator/FILES
@@ -29,8 +29,6 @@ lib/BaseModel.php
 lib/Middleware/JsonBodyParserMiddleware.php
 lib/Model/ApiResponse.php
 lib/Model/Category.php
-lib/Model/InlineObject.php
-lib/Model/InlineObject1.php
 lib/Model/Order.php
 lib/Model/Pet.php
 lib/Model/Tag.php
diff --git a/samples/server/petstore/php-slim4/README.md b/samples/server/petstore/php-slim4/README.md
index a1bf87063b3..3f5c820198c 100644
--- a/samples/server/petstore/php-slim4/README.md
+++ b/samples/server/petstore/php-slim4/README.md
@@ -159,8 +159,6 @@ Class | Method | HTTP request | Description
 
 * OpenAPIServer\Model\ApiResponse
 * OpenAPIServer\Model\Category
-* OpenAPIServer\Model\InlineObject
-* OpenAPIServer\Model\InlineObject1
 * OpenAPIServer\Model\Order
 * OpenAPIServer\Model\Pet
 * OpenAPIServer\Model\Tag
diff --git a/samples/server/petstore/php-ze-ph/.openapi-generator/FILES b/samples/server/petstore/php-ze-ph/.openapi-generator/FILES
index d2b3e5a4d23..bfad086c5ac 100644
--- a/samples/server/petstore/php-ze-ph/.openapi-generator/FILES
+++ b/samples/server/petstore/php-ze-ph/.openapi-generator/FILES
@@ -11,8 +11,6 @@ src/App/DTO/ApiResponse.php
 src/App/DTO/Category.php
 src/App/DTO/FindPetsByStatusQueryData.php
 src/App/DTO/FindPetsByTagsQueryData.php
-src/App/DTO/InlineObject.php
-src/App/DTO/InlineObject1.php
 src/App/DTO/LoginUserQueryData.php
 src/App/DTO/Order.php
 src/App/DTO/Pet.php
diff --git a/samples/server/petstore/rust-server/output/multipart-v3/.openapi-generator/FILES b/samples/server/petstore/rust-server/output/multipart-v3/.openapi-generator/FILES
index e1eb1a7a36f..e88627ad81f 100644
--- a/samples/server/petstore/rust-server/output/multipart-v3/.openapi-generator/FILES
+++ b/samples/server/petstore/rust-server/output/multipart-v3/.openapi-generator/FILES
@@ -5,7 +5,6 @@ README.md
 api/openapi.yaml
 docs/InlineObject.md
 docs/MultipartRelatedRequest.md
-docs/MultipartRequest.md
 docs/MultipartRequestObjectField.md
 docs/default_api.md
 examples/ca.pem
diff --git a/samples/server/petstore/rust-server/output/multipart-v3/README.md b/samples/server/petstore/rust-server/output/multipart-v3/README.md
index 87eab6b756a..1ad0dea45f3 100644
--- a/samples/server/petstore/rust-server/output/multipart-v3/README.md
+++ b/samples/server/petstore/rust-server/output/multipart-v3/README.md
@@ -106,7 +106,6 @@ Method | HTTP request | Description
 
  - [InlineObject](docs/InlineObject.md)
  - [MultipartRelatedRequest](docs/MultipartRelatedRequest.md)
- - [MultipartRequest](docs/MultipartRequest.md)
  - [MultipartRequestObjectField](docs/MultipartRequestObjectField.md)
 
 
diff --git a/samples/server/petstore/rust-server/output/multipart-v3/src/models.rs b/samples/server/petstore/rust-server/output/multipart-v3/src/models.rs
index 82c937bad8d..b86806bfeeb 100644
--- a/samples/server/petstore/rust-server/output/multipart-v3/src/models.rs
+++ b/samples/server/petstore/rust-server/output/multipart-v3/src/models.rs
@@ -264,154 +264,6 @@ impl std::str::FromStr for MultipartRelatedRequest {
 
 
 
-// Methods for converting between header::IntoHeaderValue<MultipartRequest> and hyper::header::HeaderValue
-
-#[cfg(any(feature = "client", feature = "server"))]
-impl std::convert::TryFrom<header::IntoHeaderValue<MultipartRequest>> for hyper::header::HeaderValue {
-    type Error = String;
-
-    fn try_from(hdr_value: header::IntoHeaderValue<MultipartRequest>) -> std::result::Result<Self, Self::Error> {
-        let hdr_value = hdr_value.to_string();
-        match hyper::header::HeaderValue::from_str(&hdr_value) {
-             std::result::Result::Ok(value) => std::result::Result::Ok(value),
-             std::result::Result::Err(e) => std::result::Result::Err(
-                 format!("Invalid header value for MultipartRequest - value: {} is invalid {}",
-                     hdr_value, e))
-        }
-    }
-}
-
-#[cfg(any(feature = "client", feature = "server"))]
-impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<MultipartRequest> {
-    type Error = String;
-
-    fn try_from(hdr_value: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
-        match hdr_value.to_str() {
-             std::result::Result::Ok(value) => {
-                    match <MultipartRequest as std::str::FromStr>::from_str(value) {
-                        std::result::Result::Ok(value) => std::result::Result::Ok(header::IntoHeaderValue(value)),
-                        std::result::Result::Err(err) => std::result::Result::Err(
-                            format!("Unable to convert header value '{}' into MultipartRequest - {}",
-                                value, err))
-                    }
-             },
-             std::result::Result::Err(e) => std::result::Result::Err(
-                 format!("Unable to convert header: {:?} to string: {}",
-                     hdr_value, e))
-        }
-    }
-}
-
-
-#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
-#[cfg_attr(feature = "conversion", derive(frunk::LabelledGeneric))]
-pub struct MultipartRequest {
-    #[serde(rename = "string_field")]
-    pub string_field: String,
-
-    #[serde(rename = "optional_string_field")]
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub optional_string_field: Option<String>,
-
-    #[serde(rename = "object_field")]
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub object_field: Option<models::MultipartRequestObjectField>,
-
-    #[serde(rename = "binary_field")]
-    pub binary_field: swagger::ByteArray,
-
-}
-
-impl MultipartRequest {
-    pub fn new(string_field: String, binary_field: swagger::ByteArray, ) -> MultipartRequest {
-        MultipartRequest {
-            string_field: string_field,
-            optional_string_field: None,
-            object_field: None,
-            binary_field: binary_field,
-        }
-    }
-}
-
-/// Converts the MultipartRequest value to the Query Parameters representation (style=form, explode=false)
-/// specified in https://swagger.io/docs/specification/serialization/
-/// Should be implemented in a serde serializer
-impl std::string::ToString for MultipartRequest {
-    fn to_string(&self) -> String {
-        let mut params: Vec<String> = vec![];
-
-        params.push("string_field".to_string());
-        params.push(self.string_field.to_string());
-
-
-        if let Some(ref optional_string_field) = self.optional_string_field {
-            params.push("optional_string_field".to_string());
-            params.push(optional_string_field.to_string());
-        }
-
-        // Skipping object_field in query parameter serialization
-
-        // Skipping binary_field in query parameter serialization
-        // Skipping binary_field in query parameter serialization
-
-        params.join(",").to_string()
-    }
-}
-
-/// Converts Query Parameters representation (style=form, explode=false) to a MultipartRequest value
-/// as specified in https://swagger.io/docs/specification/serialization/
-/// Should be implemented in a serde deserializer
-impl std::str::FromStr for MultipartRequest {
-    type Err = String;
-
-    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
-        #[derive(Default)]
-        // An intermediate representation of the struct to use for parsing.
-        struct IntermediateRep {
-            pub string_field: Vec<String>,
-            pub optional_string_field: Vec<String>,
-            pub object_field: Vec<models::MultipartRequestObjectField>,
-            pub binary_field: Vec<swagger::ByteArray>,
-        }
-
-        let mut intermediate_rep = IntermediateRep::default();
-
-        // Parse into intermediate representation
-        let mut string_iter = s.split(',').into_iter();
-        let mut key_result = string_iter.next();
-
-        while key_result.is_some() {
-            let val = match string_iter.next() {
-                Some(x) => x,
-                None => return std::result::Result::Err("Missing value while parsing MultipartRequest".to_string())
-            };
-
-            if let Some(key) = key_result {
-                match key {
-                    "string_field" => intermediate_rep.string_field.push(String::from_str(val).map_err(|x| format!("{}", x))?),
-                    "optional_string_field" => intermediate_rep.optional_string_field.push(String::from_str(val).map_err(|x| format!("{}", x))?),
-                    "object_field" => intermediate_rep.object_field.push(models::MultipartRequestObjectField::from_str(val).map_err(|x| format!("{}", x))?),
-                    "binary_field" => return std::result::Result::Err("Parsing binary data in this style is not supported in MultipartRequest".to_string()),
-                    _ => return std::result::Result::Err("Unexpected key while parsing MultipartRequest".to_string())
-                }
-            }
-
-            // Get the next key
-            key_result = string_iter.next();
-        }
-
-        // Use the intermediate representation to return the struct
-        std::result::Result::Ok(MultipartRequest {
-            string_field: intermediate_rep.string_field.into_iter().next().ok_or("string_field missing in MultipartRequest".to_string())?,
-            optional_string_field: intermediate_rep.optional_string_field.into_iter().next(),
-            object_field: intermediate_rep.object_field.into_iter().next(),
-            binary_field: intermediate_rep.binary_field.into_iter().next().ok_or("binary_field missing in MultipartRequest".to_string())?,
-        })
-    }
-}
-
-
-
 // Methods for converting between header::IntoHeaderValue<MultipartRequestObjectField> and hyper::header::HeaderValue
 
 #[cfg(any(feature = "client", feature = "server"))]