diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
index efacc311118f..57669143b74b 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -2802,7 +2802,12 @@ protected void updateModelForComposedSchema(CodegenModel m, Schema schema, Map<S
                 addImport(composed, refSchema, m, modelName);
 
                 if (allDefinitions != null && refSchema != null) {
-                    if (allParents.contains(ref) && supportsMultipleInheritance) {
+                    if (ModelUtils.hasOneOf(refSchema)) {
+                        // Do not flatten oneOf variant properties into this model.
+                        // addProperties() would recurse into each variant and merge all
+                        // their properties, producing an impossible conjunction. The oneOf
+                        // ref is already tracked via m.interfaces.
+                    } else if (allParents.contains(ref) && supportsMultipleInheritance) {
                         // multiple inheritance
                         addProperties(allProperties, allRequired, refSchema, new HashSet<>());
                     } else if (parentName != null && parentName.equals(ref) && supportsInheritance) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java
index 84d8cf484f73..62a961d51b87 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java
@@ -1589,6 +1589,11 @@ public static String getParentName(Schema composedSchema, Map<String, Schema> al
                     } else if (hasOrInheritsDiscriminator(s, allSchemas, new ArrayList<Schema>())) {
                         // discriminator.propertyName is used or x-parent is used
                         parentNameCandidates.add(parentName);
+                    } else if (hasOneOf(s)) {
+                        // a $ref to a oneOf schema is treated as a parent even without
+                        // a discriminator, to avoid flattening union type variants into
+                        // an impossible conjunction of all variant properties
+                        parentNameCandidates.add(parentName);
                     } else {
                         // not a parent since discriminator.propertyName or x-parent is not set
                         hasAmbiguousParents = true;
@@ -1658,6 +1663,13 @@ private static List<String> getAllParentsName(
                         if (includeAncestors && isComposedSchema(s)) {
                             names.addAll(getAllParentsName(s, allSchemas, true, seenNames));
                         }
+                    } else if (hasOneOf(s)) {
+                        // a $ref to a oneOf schema is treated as a parent even without
+                        // a discriminator
+                        names.add(parentName);
+                        if (includeAncestors && isComposedSchema(s)) {
+                            names.addAll(getAllParentsName(s, allSchemas, true, seenNames));
+                        }
                     } else {
                         // not a parent since discriminator.propertyName is not set
                     }
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
index 1f0e4a8f8fc6..0d8c32481587 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
@@ -1171,6 +1171,51 @@ public void testAllOfRequired() {
         assertEquals(getRequiredVars(childModel), Collections.singletonList("name"));
     }
 
+    @Test
+    public void testAllOfWithOneOfRefNoDiscriminator() {
+        final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/allOf_oneOf_noDiscriminator.yaml");
+        DefaultCodegen codegen = new DefaultCodegen();
+        codegen.supportsInheritance = true;
+        codegen.setOpenAPI(openAPI);
+
+        // ParentC uses allOf with a $ref to Child (a oneOf without discriminator).
+        // Child should be recognized as a parent, not flattened.
+        Schema parentCSchema = openAPI.getComponents().getSchemas().get("ParentC");
+        CodegenModel parentCModel = codegen.fromModel("ParentC", parentCSchema);
+        assertEquals("Child", parentCModel.parentSchema);
+        assertEquals("Child", parentCModel.parent);
+
+        // Only the own property "type" should be in vars, not the oneOf variant properties
+        List<String> varNames = parentCModel.vars.stream().map(v -> v.name).collect(Collectors.toList());
+        assertTrue(varNames.contains("type"), "vars should contain 'type'");
+        assertFalse(varNames.contains("xOnlyField"), "vars should not contain variant-specific 'xOnlyField'");
+        assertFalse(varNames.contains("yOnlyField"), "vars should not contain variant-specific 'yOnlyField'");
+        assertFalse(varNames.contains("zOnlyField"), "vars should not contain variant-specific 'zOnlyField'");
+
+        // allVars should also not contain flattened variant properties
+        List<String> allVarNames = parentCModel.allVars.stream().map(v -> v.name).collect(Collectors.toList());
+        assertFalse(allVarNames.contains("xOnlyField"), "allVars should not contain variant-specific 'xOnlyField'");
+        assertFalse(allVarNames.contains("yOnlyField"), "allVars should not contain variant-specific 'yOnlyField'");
+        assertFalse(allVarNames.contains("zOnlyField"), "allVars should not contain variant-specific 'zOnlyField'");
+    }
+
+    @Test
+    public void testAllOfWithOneOfRefNoDiscriminatorNoInheritance() {
+        final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/allOf_oneOf_noDiscriminator.yaml");
+        DefaultCodegen codegen = new DefaultCodegen();
+        codegen.supportsInheritance = false;
+        codegen.setOpenAPI(openAPI);
+
+        // Even without supportsInheritance, variant properties should not be flattened
+        Schema parentCSchema = openAPI.getComponents().getSchemas().get("ParentC");
+        CodegenModel parentCModel = codegen.fromModel("ParentC", parentCSchema);
+
+        List<String> varNames = parentCModel.vars.stream().map(v -> v.name).collect(Collectors.toList());
+        assertFalse(varNames.contains("xOnlyField"), "vars should not contain variant-specific 'xOnlyField'");
+        assertFalse(varNames.contains("yOnlyField"), "vars should not contain variant-specific 'yOnlyField'");
+        assertFalse(varNames.contains("zOnlyField"), "vars should not contain variant-specific 'zOnlyField'");
+    }
+
     @Test
     public void testAllOfSingleAndDoubleRefWithOwnPropsNoDiscriminator() {
         final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/allOf_composition.yaml");
diff --git a/modules/openapi-generator/src/test/resources/3_0/allOf_oneOf_noDiscriminator.yaml b/modules/openapi-generator/src/test/resources/3_0/allOf_oneOf_noDiscriminator.yaml
new file mode 100644
index 000000000000..8dca0ea2f160
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/3_0/allOf_oneOf_noDiscriminator.yaml
@@ -0,0 +1,63 @@
+openapi: 3.0.2
+info:
+  title: allOf with oneOf (no discriminator) test
+  version: 1.0.0
+paths:
+  /parent:
+    get:
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ParentC'
+components:
+  schemas:
+    ParentC:
+      allOf:
+        - type: object
+          required: [type]
+          properties:
+            type:
+              type: string
+        - $ref: "#/components/schemas/Child"
+
+    Child:
+      oneOf:
+        - $ref: "#/components/schemas/ChildX"
+        - $ref: "#/components/schemas/ChildY"
+        - $ref: "#/components/schemas/ChildZ"
+
+    ChildX:
+      type: object
+      required: [kind, sharedField, xOnlyField]
+      properties:
+        kind:
+          type: string
+        sharedField:
+          type: string
+        xOnlyField:
+          type: string
+
+    ChildY:
+      type: object
+      required: [kind, sharedField, yOnlyField]
+      properties:
+        kind:
+          type: string
+        sharedField:
+          type: string
+        yOnlyField:
+          type: string
+
+    ChildZ:
+      type: object
+      required: [kind, sharedField, zOnlyField]
+      properties:
+        kind:
+          type: string
+        sharedField:
+          type: string
+        zOnlyField:
+          type: integer
diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/docs/models/NullableShape.md b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/docs/models/NullableShape.md
index 2720167ccaaa..0caa1aa5b9d8 100644
--- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/docs/models/NullableShape.md
+++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/docs/models/NullableShape.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/docs/models/Shape.md b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/docs/models/Shape.md
index ae75c5925401..cd9e7e1499d2 100644
--- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/docs/models/Shape.md
+++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/docs/models/Shape.md
@@ -4,7 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/docs/models/ShapeOrNull.md
index 7fcd31a3a5e1..1bd04583c9a0 100644
--- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/docs/models/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/docs/models/ShapeOrNull.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/NullableShape.cs
index 218f63d9bc7c..3c17614f48a8 100644
--- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/NullableShape.cs
+++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/NullableShape.cs
@@ -34,7 +34,7 @@ public partial class NullableShape : IValidatableObject
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public NullableShape(Triangle triangle)
+        internal NullableShape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -44,7 +44,7 @@ public NullableShape(Triangle triangle)
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public NullableShape(Quadrilateral quadrilateral)
+        internal NullableShape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -117,8 +117,6 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string?> shapeType = default;
-
             Quadrilateral? quadrilateral = null;
             Triangle? triangle = null;
 
@@ -167,21 +165,12 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string?>(utf8JsonReader.GetString()!);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class NullableShape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class NullableShape.");
-
             if (quadrilateral != null)
                 return new NullableShape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/Shape.cs
index ed706f0092b8..f357a76dcd31 100644
--- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/Shape.cs
+++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/Shape.cs
@@ -34,7 +34,7 @@ public partial class Shape : IValidatableObject
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public Shape(Triangle triangle)
+        internal Shape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -44,7 +44,7 @@ public Shape(Triangle triangle)
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public Shape(Quadrilateral quadrilateral)
+        internal Shape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -117,8 +117,6 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string?> shapeType = default;
-
             Quadrilateral? quadrilateral = null;
             Triangle? triangle = null;
 
@@ -167,21 +165,12 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string?>(utf8JsonReader.GetString()!);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class Shape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class Shape.");
-
             if (quadrilateral != null)
                 return new Shape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/ShapeOrNull.cs
index 3384090adea8..4410fc1f8296 100644
--- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/ShapeOrNull.cs
+++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/ShapeOrNull.cs
@@ -34,7 +34,7 @@ public partial class ShapeOrNull : IValidatableObject
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public ShapeOrNull(Triangle triangle)
+        internal ShapeOrNull(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -44,7 +44,7 @@ public ShapeOrNull(Triangle triangle)
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public ShapeOrNull(Quadrilateral quadrilateral)
+        internal ShapeOrNull(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -117,8 +117,6 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string?> shapeType = default;
-
             Quadrilateral? quadrilateral = null;
             Triangle? triangle = null;
 
@@ -167,21 +165,12 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string?>(utf8JsonReader.GetString()!);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class ShapeOrNull.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class ShapeOrNull.");
-
             if (quadrilateral != null)
                 return new ShapeOrNull(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/NullableShape.md b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/NullableShape.md
index 2720167ccaaa..0caa1aa5b9d8 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/NullableShape.md
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/NullableShape.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/Shape.md b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/Shape.md
index ae75c5925401..cd9e7e1499d2 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/Shape.md
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/Shape.md
@@ -4,7 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/ShapeOrNull.md
index 7fcd31a3a5e1..1bd04583c9a0 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/ShapeOrNull.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/NullableShape.cs
index 9a93cb734e9c..7aaf53bf6227 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/NullableShape.cs
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/NullableShape.cs
@@ -33,7 +33,7 @@ public partial class NullableShape : IValidatableObject
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public NullableShape(Triangle triangle)
+        internal NullableShape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public NullableShape(Triangle triangle)
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public NullableShape(Quadrilateral quadrilateral)
+        internal NullableShape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class NullableShape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class NullableShape.");
-
             if (quadrilateral != null)
                 return new NullableShape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/Shape.cs
index c651ac7d2454..ab82878ee393 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/Shape.cs
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/Shape.cs
@@ -33,7 +33,7 @@ public partial class Shape : IValidatableObject
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public Shape(Triangle triangle)
+        internal Shape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public Shape(Triangle triangle)
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public Shape(Quadrilateral quadrilateral)
+        internal Shape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class Shape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class Shape.");
-
             if (quadrilateral != null)
                 return new Shape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/ShapeOrNull.cs
index 1f0b22030070..f83d9bc6bec3 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/ShapeOrNull.cs
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/ShapeOrNull.cs
@@ -33,7 +33,7 @@ public partial class ShapeOrNull : IValidatableObject
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public ShapeOrNull(Triangle triangle)
+        internal ShapeOrNull(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public ShapeOrNull(Triangle triangle)
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public ShapeOrNull(Quadrilateral quadrilateral)
+        internal ShapeOrNull(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class ShapeOrNull.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class ShapeOrNull.");
-
             if (quadrilateral != null)
                 return new ShapeOrNull(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/docs/models/NullableShape.md b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/docs/models/NullableShape.md
index 2720167ccaaa..0caa1aa5b9d8 100644
--- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/docs/models/NullableShape.md
+++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/docs/models/NullableShape.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/docs/models/Shape.md b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/docs/models/Shape.md
index ae75c5925401..cd9e7e1499d2 100644
--- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/docs/models/Shape.md
+++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/docs/models/Shape.md
@@ -4,7 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/docs/models/ShapeOrNull.md
index 7fcd31a3a5e1..1bd04583c9a0 100644
--- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/docs/models/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/docs/models/ShapeOrNull.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/NullableShape.cs
index a06afa2a9be6..754b4013e4bf 100644
--- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/NullableShape.cs
+++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/NullableShape.cs
@@ -35,7 +35,7 @@ public partial class NullableShape : IValidatableObject
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public NullableShape(Triangle triangle)
+        internal NullableShape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -45,7 +45,7 @@ public NullableShape(Triangle triangle)
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public NullableShape(Quadrilateral quadrilateral)
+        internal NullableShape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -125,8 +125,6 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string?> shapeType = default;
-
             Quadrilateral? quadrilateral = null;
             Triangle? triangle = null;
 
@@ -175,21 +173,12 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string?>(utf8JsonReader.GetString()!);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class NullableShape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class NullableShape.");
-
             if (quadrilateral != null)
                 return new NullableShape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/Shape.cs
index c608b7288d95..cba24ec56f86 100644
--- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/Shape.cs
+++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/Shape.cs
@@ -35,7 +35,7 @@ public partial class Shape : IValidatableObject
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public Shape(Triangle triangle)
+        internal Shape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -45,7 +45,7 @@ public Shape(Triangle triangle)
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public Shape(Quadrilateral quadrilateral)
+        internal Shape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -125,8 +125,6 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string?> shapeType = default;
-
             Quadrilateral? quadrilateral = null;
             Triangle? triangle = null;
 
@@ -175,21 +173,12 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string?>(utf8JsonReader.GetString()!);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class Shape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class Shape.");
-
             if (quadrilateral != null)
                 return new Shape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/ShapeOrNull.cs
index 3fc9f2735096..518b6d17be42 100644
--- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/ShapeOrNull.cs
+++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/ShapeOrNull.cs
@@ -35,7 +35,7 @@ public partial class ShapeOrNull : IValidatableObject
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public ShapeOrNull(Triangle triangle)
+        internal ShapeOrNull(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -45,7 +45,7 @@ public ShapeOrNull(Triangle triangle)
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public ShapeOrNull(Quadrilateral quadrilateral)
+        internal ShapeOrNull(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -125,8 +125,6 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string?> shapeType = default;
-
             Quadrilateral? quadrilateral = null;
             Triangle? triangle = null;
 
@@ -175,21 +173,12 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string?>(utf8JsonReader.GetString()!);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class ShapeOrNull.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class ShapeOrNull.");
-
             if (quadrilateral != null)
                 return new ShapeOrNull(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/docs/models/NullableShape.md b/samples/client/petstore/csharp/generichost/net10/Petstore/docs/models/NullableShape.md
index 2720167ccaaa..0caa1aa5b9d8 100644
--- a/samples/client/petstore/csharp/generichost/net10/Petstore/docs/models/NullableShape.md
+++ b/samples/client/petstore/csharp/generichost/net10/Petstore/docs/models/NullableShape.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/docs/models/Shape.md b/samples/client/petstore/csharp/generichost/net10/Petstore/docs/models/Shape.md
index ae75c5925401..cd9e7e1499d2 100644
--- a/samples/client/petstore/csharp/generichost/net10/Petstore/docs/models/Shape.md
+++ b/samples/client/petstore/csharp/generichost/net10/Petstore/docs/models/Shape.md
@@ -4,7 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp/generichost/net10/Petstore/docs/models/ShapeOrNull.md
index 7fcd31a3a5e1..1bd04583c9a0 100644
--- a/samples/client/petstore/csharp/generichost/net10/Petstore/docs/models/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/generichost/net10/Petstore/docs/models/ShapeOrNull.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs
index 9a93cb734e9c..7aaf53bf6227 100644
--- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs
+++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs
@@ -33,7 +33,7 @@ public partial class NullableShape : IValidatableObject
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public NullableShape(Triangle triangle)
+        internal NullableShape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public NullableShape(Triangle triangle)
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public NullableShape(Quadrilateral quadrilateral)
+        internal NullableShape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class NullableShape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class NullableShape.");
-
             if (quadrilateral != null)
                 return new NullableShape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/Shape.cs
index c651ac7d2454..ab82878ee393 100644
--- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/Shape.cs
+++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/Shape.cs
@@ -33,7 +33,7 @@ public partial class Shape : IValidatableObject
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public Shape(Triangle triangle)
+        internal Shape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public Shape(Triangle triangle)
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public Shape(Quadrilateral quadrilateral)
+        internal Shape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class Shape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class Shape.");
-
             if (quadrilateral != null)
                 return new Shape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs
index 1f0b22030070..f83d9bc6bec3 100644
--- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs
+++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs
@@ -33,7 +33,7 @@ public partial class ShapeOrNull : IValidatableObject
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public ShapeOrNull(Triangle triangle)
+        internal ShapeOrNull(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public ShapeOrNull(Triangle triangle)
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public ShapeOrNull(Quadrilateral quadrilateral)
+        internal ShapeOrNull(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class ShapeOrNull.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class ShapeOrNull.");
-
             if (quadrilateral != null)
                 return new ShapeOrNull(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/docs/models/NullableShape.md b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/docs/models/NullableShape.md
index 2720167ccaaa..0caa1aa5b9d8 100644
--- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/docs/models/NullableShape.md
+++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/docs/models/NullableShape.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/docs/models/Shape.md b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/docs/models/Shape.md
index ae75c5925401..cd9e7e1499d2 100644
--- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/docs/models/Shape.md
+++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/docs/models/Shape.md
@@ -4,7 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/docs/models/ShapeOrNull.md
index 7fcd31a3a5e1..1bd04583c9a0 100644
--- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/docs/models/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/docs/models/ShapeOrNull.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/NullableShape.cs
index 25248c75ffaf..40ca3427b663 100644
--- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/NullableShape.cs
+++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/NullableShape.cs
@@ -36,7 +36,7 @@ public partial class NullableShape : IValidatableObject
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public NullableShape(Triangle triangle)
+        internal NullableShape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -46,7 +46,7 @@ public NullableShape(Triangle triangle)
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public NullableShape(Quadrilateral quadrilateral)
+        internal NullableShape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -126,8 +126,6 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string?> shapeType = default;
-
             Quadrilateral? quadrilateral = null;
             Triangle? triangle = null;
 
@@ -176,21 +174,12 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string?>(utf8JsonReader.GetString()!);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class NullableShape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class NullableShape.");
-
             if (quadrilateral != null)
                 return new NullableShape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/Shape.cs
index 71620d915bbb..6e33d5b7ef54 100644
--- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/Shape.cs
+++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/Shape.cs
@@ -36,7 +36,7 @@ public partial class Shape : IValidatableObject
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public Shape(Triangle triangle)
+        internal Shape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -46,7 +46,7 @@ public Shape(Triangle triangle)
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public Shape(Quadrilateral quadrilateral)
+        internal Shape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -126,8 +126,6 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string?> shapeType = default;
-
             Quadrilateral? quadrilateral = null;
             Triangle? triangle = null;
 
@@ -176,21 +174,12 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string?>(utf8JsonReader.GetString()!);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class Shape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class Shape.");
-
             if (quadrilateral != null)
                 return new Shape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/ShapeOrNull.cs
index 37b5fddee5e3..7cd9753f1eed 100644
--- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/ShapeOrNull.cs
+++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/ShapeOrNull.cs
@@ -36,7 +36,7 @@ public partial class ShapeOrNull : IValidatableObject
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public ShapeOrNull(Triangle triangle)
+        internal ShapeOrNull(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -46,7 +46,7 @@ public ShapeOrNull(Triangle triangle)
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public ShapeOrNull(Quadrilateral quadrilateral)
+        internal ShapeOrNull(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -126,8 +126,6 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string?> shapeType = default;
-
             Quadrilateral? quadrilateral = null;
             Triangle? triangle = null;
 
@@ -176,21 +174,12 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string?>(utf8JsonReader.GetString()!);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class ShapeOrNull.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class ShapeOrNull.");
-
             if (quadrilateral != null)
                 return new ShapeOrNull(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/NullableShape.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/NullableShape.md
index 2720167ccaaa..0caa1aa5b9d8 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/NullableShape.md
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/NullableShape.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/Shape.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/Shape.md
index ae75c5925401..cd9e7e1499d2 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/Shape.md
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/Shape.md
@@ -4,7 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/ShapeOrNull.md
index 7fcd31a3a5e1..1bd04583c9a0 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/ShapeOrNull.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/NullableShape.cs
index 9a93cb734e9c..7aaf53bf6227 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/NullableShape.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/NullableShape.cs
@@ -33,7 +33,7 @@ public partial class NullableShape : IValidatableObject
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public NullableShape(Triangle triangle)
+        internal NullableShape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public NullableShape(Triangle triangle)
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public NullableShape(Quadrilateral quadrilateral)
+        internal NullableShape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class NullableShape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class NullableShape.");
-
             if (quadrilateral != null)
                 return new NullableShape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/Shape.cs
index c651ac7d2454..ab82878ee393 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/Shape.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/Shape.cs
@@ -33,7 +33,7 @@ public partial class Shape : IValidatableObject
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public Shape(Triangle triangle)
+        internal Shape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public Shape(Triangle triangle)
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public Shape(Quadrilateral quadrilateral)
+        internal Shape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class Shape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class Shape.");
-
             if (quadrilateral != null)
                 return new Shape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/ShapeOrNull.cs
index 1f0b22030070..f83d9bc6bec3 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/ShapeOrNull.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/ShapeOrNull.cs
@@ -33,7 +33,7 @@ public partial class ShapeOrNull : IValidatableObject
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public ShapeOrNull(Triangle triangle)
+        internal ShapeOrNull(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public ShapeOrNull(Triangle triangle)
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public ShapeOrNull(Quadrilateral quadrilateral)
+        internal ShapeOrNull(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class ShapeOrNull.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class ShapeOrNull.");
-
             if (quadrilateral != null)
                 return new ShapeOrNull(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/NullableShape.md b/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/NullableShape.md
index 2720167ccaaa..0caa1aa5b9d8 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/NullableShape.md
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/NullableShape.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/Shape.md b/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/Shape.md
index ae75c5925401..cd9e7e1499d2 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/Shape.md
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/Shape.md
@@ -4,7 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/ShapeOrNull.md
index 7fcd31a3a5e1..1bd04583c9a0 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/ShapeOrNull.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs
index 9a93cb734e9c..7aaf53bf6227 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs
@@ -33,7 +33,7 @@ public partial class NullableShape : IValidatableObject
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public NullableShape(Triangle triangle)
+        internal NullableShape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public NullableShape(Triangle triangle)
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public NullableShape(Quadrilateral quadrilateral)
+        internal NullableShape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class NullableShape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class NullableShape.");
-
             if (quadrilateral != null)
                 return new NullableShape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/Shape.cs
index c651ac7d2454..ab82878ee393 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/Shape.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/Shape.cs
@@ -33,7 +33,7 @@ public partial class Shape : IValidatableObject
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public Shape(Triangle triangle)
+        internal Shape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public Shape(Triangle triangle)
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public Shape(Quadrilateral quadrilateral)
+        internal Shape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class Shape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class Shape.");
-
             if (quadrilateral != null)
                 return new Shape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs
index 1f0b22030070..f83d9bc6bec3 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs
@@ -33,7 +33,7 @@ public partial class ShapeOrNull : IValidatableObject
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public ShapeOrNull(Triangle triangle)
+        internal ShapeOrNull(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public ShapeOrNull(Triangle triangle)
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public ShapeOrNull(Quadrilateral quadrilateral)
+        internal ShapeOrNull(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class ShapeOrNull.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class ShapeOrNull.");
-
             if (quadrilateral != null)
                 return new ShapeOrNull(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/NullableShape.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/NullableShape.md
index 2720167ccaaa..0caa1aa5b9d8 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/NullableShape.md
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/NullableShape.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/Shape.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/Shape.md
index ae75c5925401..cd9e7e1499d2 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/Shape.md
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/Shape.md
@@ -4,7 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/ShapeOrNull.md
index 7fcd31a3a5e1..1bd04583c9a0 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/ShapeOrNull.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/NullableShape.cs
index 9a93cb734e9c..7aaf53bf6227 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/NullableShape.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/NullableShape.cs
@@ -33,7 +33,7 @@ public partial class NullableShape : IValidatableObject
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public NullableShape(Triangle triangle)
+        internal NullableShape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public NullableShape(Triangle triangle)
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public NullableShape(Quadrilateral quadrilateral)
+        internal NullableShape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class NullableShape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class NullableShape.");
-
             if (quadrilateral != null)
                 return new NullableShape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/Shape.cs
index c651ac7d2454..ab82878ee393 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/Shape.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/Shape.cs
@@ -33,7 +33,7 @@ public partial class Shape : IValidatableObject
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public Shape(Triangle triangle)
+        internal Shape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public Shape(Triangle triangle)
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public Shape(Quadrilateral quadrilateral)
+        internal Shape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class Shape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class Shape.");
-
             if (quadrilateral != null)
                 return new Shape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/ShapeOrNull.cs
index 1f0b22030070..f83d9bc6bec3 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/ShapeOrNull.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/ShapeOrNull.cs
@@ -33,7 +33,7 @@ public partial class ShapeOrNull : IValidatableObject
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public ShapeOrNull(Triangle triangle)
+        internal ShapeOrNull(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public ShapeOrNull(Triangle triangle)
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public ShapeOrNull(Quadrilateral quadrilateral)
+        internal ShapeOrNull(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class ShapeOrNull.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class ShapeOrNull.");
-
             if (quadrilateral != null)
                 return new ShapeOrNull(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/NullableShape.md b/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/NullableShape.md
index 2720167ccaaa..0caa1aa5b9d8 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/NullableShape.md
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/NullableShape.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/Shape.md b/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/Shape.md
index ae75c5925401..cd9e7e1499d2 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/Shape.md
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/Shape.md
@@ -4,7 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/ShapeOrNull.md
index 7fcd31a3a5e1..1bd04583c9a0 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/ShapeOrNull.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs
index 9a93cb734e9c..7aaf53bf6227 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs
@@ -33,7 +33,7 @@ public partial class NullableShape : IValidatableObject
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public NullableShape(Triangle triangle)
+        internal NullableShape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public NullableShape(Triangle triangle)
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public NullableShape(Quadrilateral quadrilateral)
+        internal NullableShape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class NullableShape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class NullableShape.");
-
             if (quadrilateral != null)
                 return new NullableShape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/Shape.cs
index c651ac7d2454..ab82878ee393 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/Shape.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/Shape.cs
@@ -33,7 +33,7 @@ public partial class Shape : IValidatableObject
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public Shape(Triangle triangle)
+        internal Shape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public Shape(Triangle triangle)
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public Shape(Quadrilateral quadrilateral)
+        internal Shape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class Shape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class Shape.");
-
             if (quadrilateral != null)
                 return new Shape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs
index 1f0b22030070..f83d9bc6bec3 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs
@@ -33,7 +33,7 @@ public partial class ShapeOrNull : IValidatableObject
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public ShapeOrNull(Triangle triangle)
+        internal ShapeOrNull(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public ShapeOrNull(Triangle triangle)
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public ShapeOrNull(Quadrilateral quadrilateral)
+        internal ShapeOrNull(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class ShapeOrNull.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class ShapeOrNull.");
-
             if (quadrilateral != null)
                 return new ShapeOrNull(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/NullableShape.md b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/NullableShape.md
index 2720167ccaaa..0caa1aa5b9d8 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/NullableShape.md
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/NullableShape.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/Shape.md b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/Shape.md
index ae75c5925401..cd9e7e1499d2 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/Shape.md
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/Shape.md
@@ -4,7 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/ShapeOrNull.md
index 7fcd31a3a5e1..1bd04583c9a0 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/ShapeOrNull.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/NullableShape.cs
index 9a93cb734e9c..7aaf53bf6227 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/NullableShape.cs
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/NullableShape.cs
@@ -33,7 +33,7 @@ public partial class NullableShape : IValidatableObject
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public NullableShape(Triangle triangle)
+        internal NullableShape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public NullableShape(Triangle triangle)
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public NullableShape(Quadrilateral quadrilateral)
+        internal NullableShape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class NullableShape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class NullableShape.");
-
             if (quadrilateral != null)
                 return new NullableShape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/Shape.cs
index c651ac7d2454..ab82878ee393 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/Shape.cs
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/Shape.cs
@@ -33,7 +33,7 @@ public partial class Shape : IValidatableObject
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public Shape(Triangle triangle)
+        internal Shape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public Shape(Triangle triangle)
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public Shape(Quadrilateral quadrilateral)
+        internal Shape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class Shape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class Shape.");
-
             if (quadrilateral != null)
                 return new Shape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/ShapeOrNull.cs
index 1f0b22030070..f83d9bc6bec3 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/ShapeOrNull.cs
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/ShapeOrNull.cs
@@ -33,7 +33,7 @@ public partial class ShapeOrNull : IValidatableObject
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public ShapeOrNull(Triangle triangle)
+        internal ShapeOrNull(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public ShapeOrNull(Triangle triangle)
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public ShapeOrNull(Quadrilateral quadrilateral)
+        internal ShapeOrNull(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class ShapeOrNull.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class ShapeOrNull.");
-
             if (quadrilateral != null)
                 return new ShapeOrNull(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/NullableShape.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/NullableShape.md
index 2720167ccaaa..0caa1aa5b9d8 100644
--- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/NullableShape.md
+++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/NullableShape.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Shape.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Shape.md
index ae75c5925401..cd9e7e1499d2 100644
--- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Shape.md
+++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Shape.md
@@ -4,7 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ShapeOrNull.md
index 7fcd31a3a5e1..1bd04583c9a0 100644
--- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ShapeOrNull.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/NullableShape.cs
index a06afa2a9be6..754b4013e4bf 100644
--- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/NullableShape.cs
+++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/NullableShape.cs
@@ -35,7 +35,7 @@ public partial class NullableShape : IValidatableObject
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public NullableShape(Triangle triangle)
+        internal NullableShape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -45,7 +45,7 @@ public NullableShape(Triangle triangle)
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public NullableShape(Quadrilateral quadrilateral)
+        internal NullableShape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -125,8 +125,6 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string?> shapeType = default;
-
             Quadrilateral? quadrilateral = null;
             Triangle? triangle = null;
 
@@ -175,21 +173,12 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string?>(utf8JsonReader.GetString()!);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class NullableShape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class NullableShape.");
-
             if (quadrilateral != null)
                 return new NullableShape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Shape.cs
index c608b7288d95..cba24ec56f86 100644
--- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Shape.cs
+++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Shape.cs
@@ -35,7 +35,7 @@ public partial class Shape : IValidatableObject
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public Shape(Triangle triangle)
+        internal Shape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -45,7 +45,7 @@ public Shape(Triangle triangle)
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public Shape(Quadrilateral quadrilateral)
+        internal Shape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -125,8 +125,6 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string?> shapeType = default;
-
             Quadrilateral? quadrilateral = null;
             Triangle? triangle = null;
 
@@ -175,21 +173,12 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string?>(utf8JsonReader.GetString()!);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class Shape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class Shape.");
-
             if (quadrilateral != null)
                 return new Shape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ShapeOrNull.cs
index 3fc9f2735096..518b6d17be42 100644
--- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ShapeOrNull.cs
+++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ShapeOrNull.cs
@@ -35,7 +35,7 @@ public partial class ShapeOrNull : IValidatableObject
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public ShapeOrNull(Triangle triangle)
+        internal ShapeOrNull(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -45,7 +45,7 @@ public ShapeOrNull(Triangle triangle)
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public ShapeOrNull(Quadrilateral quadrilateral)
+        internal ShapeOrNull(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -125,8 +125,6 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string?> shapeType = default;
-
             Quadrilateral? quadrilateral = null;
             Triangle? triangle = null;
 
@@ -175,21 +173,12 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string?>(utf8JsonReader.GetString()!);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class ShapeOrNull.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class ShapeOrNull.");
-
             if (quadrilateral != null)
                 return new ShapeOrNull(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/NullableShape.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/NullableShape.md
index 2720167ccaaa..0caa1aa5b9d8 100644
--- a/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/NullableShape.md
+++ b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/NullableShape.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Shape.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Shape.md
index ae75c5925401..cd9e7e1499d2 100644
--- a/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Shape.md
+++ b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Shape.md
@@ -4,7 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ShapeOrNull.md
index 7fcd31a3a5e1..1bd04583c9a0 100644
--- a/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ShapeOrNull.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs
index 9a93cb734e9c..7aaf53bf6227 100644
--- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs
+++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs
@@ -33,7 +33,7 @@ public partial class NullableShape : IValidatableObject
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public NullableShape(Triangle triangle)
+        internal NullableShape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public NullableShape(Triangle triangle)
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public NullableShape(Quadrilateral quadrilateral)
+        internal NullableShape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class NullableShape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class NullableShape.");
-
             if (quadrilateral != null)
                 return new NullableShape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Shape.cs
index c651ac7d2454..ab82878ee393 100644
--- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Shape.cs
+++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Shape.cs
@@ -33,7 +33,7 @@ public partial class Shape : IValidatableObject
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public Shape(Triangle triangle)
+        internal Shape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public Shape(Triangle triangle)
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public Shape(Quadrilateral quadrilateral)
+        internal Shape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class Shape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class Shape.");
-
             if (quadrilateral != null)
                 return new Shape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs
index 1f0b22030070..f83d9bc6bec3 100644
--- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs
+++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs
@@ -33,7 +33,7 @@ public partial class ShapeOrNull : IValidatableObject
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public ShapeOrNull(Triangle triangle)
+        internal ShapeOrNull(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public ShapeOrNull(Triangle triangle)
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public ShapeOrNull(Quadrilateral quadrilateral)
+        internal ShapeOrNull(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class ShapeOrNull.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class ShapeOrNull.");
-
             if (quadrilateral != null)
                 return new ShapeOrNull(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/NullableShape.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/NullableShape.md
index 2720167ccaaa..0caa1aa5b9d8 100644
--- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/NullableShape.md
+++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/NullableShape.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Shape.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Shape.md
index ae75c5925401..cd9e7e1499d2 100644
--- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Shape.md
+++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Shape.md
@@ -4,7 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ShapeOrNull.md
index 7fcd31a3a5e1..1bd04583c9a0 100644
--- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ShapeOrNull.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/NullableShape.cs
index 25248c75ffaf..40ca3427b663 100644
--- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/NullableShape.cs
+++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/NullableShape.cs
@@ -36,7 +36,7 @@ public partial class NullableShape : IValidatableObject
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public NullableShape(Triangle triangle)
+        internal NullableShape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -46,7 +46,7 @@ public NullableShape(Triangle triangle)
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public NullableShape(Quadrilateral quadrilateral)
+        internal NullableShape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -126,8 +126,6 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string?> shapeType = default;
-
             Quadrilateral? quadrilateral = null;
             Triangle? triangle = null;
 
@@ -176,21 +174,12 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string?>(utf8JsonReader.GetString()!);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class NullableShape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class NullableShape.");
-
             if (quadrilateral != null)
                 return new NullableShape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/Shape.cs
index 71620d915bbb..6e33d5b7ef54 100644
--- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/Shape.cs
+++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/Shape.cs
@@ -36,7 +36,7 @@ public partial class Shape : IValidatableObject
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public Shape(Triangle triangle)
+        internal Shape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -46,7 +46,7 @@ public Shape(Triangle triangle)
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public Shape(Quadrilateral quadrilateral)
+        internal Shape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -126,8 +126,6 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string?> shapeType = default;
-
             Quadrilateral? quadrilateral = null;
             Triangle? triangle = null;
 
@@ -176,21 +174,12 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string?>(utf8JsonReader.GetString()!);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class Shape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class Shape.");
-
             if (quadrilateral != null)
                 return new Shape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/ShapeOrNull.cs
index 37b5fddee5e3..7cd9753f1eed 100644
--- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/ShapeOrNull.cs
+++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/ShapeOrNull.cs
@@ -36,7 +36,7 @@ public partial class ShapeOrNull : IValidatableObject
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public ShapeOrNull(Triangle triangle)
+        internal ShapeOrNull(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -46,7 +46,7 @@ public ShapeOrNull(Triangle triangle)
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public ShapeOrNull(Quadrilateral quadrilateral)
+        internal ShapeOrNull(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -126,8 +126,6 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string?> shapeType = default;
-
             Quadrilateral? quadrilateral = null;
             Triangle? triangle = null;
 
@@ -176,21 +174,12 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string?>(utf8JsonReader.GetString()!);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class ShapeOrNull.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class ShapeOrNull.");
-
             if (quadrilateral != null)
                 return new ShapeOrNull(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/NullableShape.md b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/NullableShape.md
index 2720167ccaaa..0caa1aa5b9d8 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/NullableShape.md
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/NullableShape.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/Shape.md b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/Shape.md
index ae75c5925401..cd9e7e1499d2 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/Shape.md
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/Shape.md
@@ -4,7 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/ShapeOrNull.md
index 7fcd31a3a5e1..1bd04583c9a0 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/ShapeOrNull.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/NullableShape.cs
index 9a93cb734e9c..7aaf53bf6227 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/NullableShape.cs
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/NullableShape.cs
@@ -33,7 +33,7 @@ public partial class NullableShape : IValidatableObject
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public NullableShape(Triangle triangle)
+        internal NullableShape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public NullableShape(Triangle triangle)
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public NullableShape(Quadrilateral quadrilateral)
+        internal NullableShape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class NullableShape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class NullableShape.");
-
             if (quadrilateral != null)
                 return new NullableShape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/Shape.cs
index c651ac7d2454..ab82878ee393 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/Shape.cs
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/Shape.cs
@@ -33,7 +33,7 @@ public partial class Shape : IValidatableObject
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public Shape(Triangle triangle)
+        internal Shape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public Shape(Triangle triangle)
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public Shape(Quadrilateral quadrilateral)
+        internal Shape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class Shape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class Shape.");
-
             if (quadrilateral != null)
                 return new Shape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/ShapeOrNull.cs
index 1f0b22030070..f83d9bc6bec3 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/ShapeOrNull.cs
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/ShapeOrNull.cs
@@ -33,7 +33,7 @@ public partial class ShapeOrNull : IValidatableObject
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public ShapeOrNull(Triangle triangle)
+        internal ShapeOrNull(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public ShapeOrNull(Triangle triangle)
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public ShapeOrNull(Quadrilateral quadrilateral)
+        internal ShapeOrNull(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class ShapeOrNull.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class ShapeOrNull.");
-
             if (quadrilateral != null)
                 return new ShapeOrNull(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/NullableShape.md b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/NullableShape.md
index 2720167ccaaa..0caa1aa5b9d8 100644
--- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/NullableShape.md
+++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/NullableShape.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/Shape.md b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/Shape.md
index ae75c5925401..cd9e7e1499d2 100644
--- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/Shape.md
+++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/Shape.md
@@ -4,7 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/ShapeOrNull.md
index 7fcd31a3a5e1..1bd04583c9a0 100644
--- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/ShapeOrNull.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/NullableShape.cs
index a06afa2a9be6..754b4013e4bf 100644
--- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/NullableShape.cs
+++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/NullableShape.cs
@@ -35,7 +35,7 @@ public partial class NullableShape : IValidatableObject
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public NullableShape(Triangle triangle)
+        internal NullableShape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -45,7 +45,7 @@ public NullableShape(Triangle triangle)
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public NullableShape(Quadrilateral quadrilateral)
+        internal NullableShape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -125,8 +125,6 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string?> shapeType = default;
-
             Quadrilateral? quadrilateral = null;
             Triangle? triangle = null;
 
@@ -175,21 +173,12 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string?>(utf8JsonReader.GetString()!);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class NullableShape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class NullableShape.");
-
             if (quadrilateral != null)
                 return new NullableShape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/Shape.cs
index c608b7288d95..cba24ec56f86 100644
--- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/Shape.cs
+++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/Shape.cs
@@ -35,7 +35,7 @@ public partial class Shape : IValidatableObject
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public Shape(Triangle triangle)
+        internal Shape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -45,7 +45,7 @@ public Shape(Triangle triangle)
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public Shape(Quadrilateral quadrilateral)
+        internal Shape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -125,8 +125,6 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string?> shapeType = default;
-
             Quadrilateral? quadrilateral = null;
             Triangle? triangle = null;
 
@@ -175,21 +173,12 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string?>(utf8JsonReader.GetString()!);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class Shape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class Shape.");
-
             if (quadrilateral != null)
                 return new Shape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/ShapeOrNull.cs
index 3fc9f2735096..518b6d17be42 100644
--- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/ShapeOrNull.cs
+++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/ShapeOrNull.cs
@@ -35,7 +35,7 @@ public partial class ShapeOrNull : IValidatableObject
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public ShapeOrNull(Triangle triangle)
+        internal ShapeOrNull(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -45,7 +45,7 @@ public ShapeOrNull(Triangle triangle)
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public ShapeOrNull(Quadrilateral quadrilateral)
+        internal ShapeOrNull(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -125,8 +125,6 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string?> shapeType = default;
-
             Quadrilateral? quadrilateral = null;
             Triangle? triangle = null;
 
@@ -175,21 +173,12 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string?>(utf8JsonReader.GetString()!);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class ShapeOrNull.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class ShapeOrNull.");
-
             if (quadrilateral != null)
                 return new ShapeOrNull(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/NullableShape.md b/samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/NullableShape.md
index 2720167ccaaa..0caa1aa5b9d8 100644
--- a/samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/NullableShape.md
+++ b/samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/NullableShape.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/Shape.md b/samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/Shape.md
index ae75c5925401..cd9e7e1499d2 100644
--- a/samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/Shape.md
+++ b/samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/Shape.md
@@ -4,7 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/ShapeOrNull.md
index 7fcd31a3a5e1..1bd04583c9a0 100644
--- a/samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/ShapeOrNull.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs
index 9a93cb734e9c..7aaf53bf6227 100644
--- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs
+++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs
@@ -33,7 +33,7 @@ public partial class NullableShape : IValidatableObject
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public NullableShape(Triangle triangle)
+        internal NullableShape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public NullableShape(Triangle triangle)
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public NullableShape(Quadrilateral quadrilateral)
+        internal NullableShape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class NullableShape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class NullableShape.");
-
             if (quadrilateral != null)
                 return new NullableShape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/Shape.cs
index c651ac7d2454..ab82878ee393 100644
--- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/Shape.cs
+++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/Shape.cs
@@ -33,7 +33,7 @@ public partial class Shape : IValidatableObject
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public Shape(Triangle triangle)
+        internal Shape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public Shape(Triangle triangle)
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public Shape(Quadrilateral quadrilateral)
+        internal Shape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class Shape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class Shape.");
-
             if (quadrilateral != null)
                 return new Shape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs
index 1f0b22030070..f83d9bc6bec3 100644
--- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs
+++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs
@@ -33,7 +33,7 @@ public partial class ShapeOrNull : IValidatableObject
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public ShapeOrNull(Triangle triangle)
+        internal ShapeOrNull(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public ShapeOrNull(Triangle triangle)
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public ShapeOrNull(Quadrilateral quadrilateral)
+        internal ShapeOrNull(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class ShapeOrNull.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class ShapeOrNull.");
-
             if (quadrilateral != null)
                 return new ShapeOrNull(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/NullableShape.md b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/NullableShape.md
index 2720167ccaaa..0caa1aa5b9d8 100644
--- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/NullableShape.md
+++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/NullableShape.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/Shape.md b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/Shape.md
index ae75c5925401..cd9e7e1499d2 100644
--- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/Shape.md
+++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/Shape.md
@@ -4,7 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/ShapeOrNull.md
index 7fcd31a3a5e1..1bd04583c9a0 100644
--- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/ShapeOrNull.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/NullableShape.cs
index 25248c75ffaf..40ca3427b663 100644
--- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/NullableShape.cs
+++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/NullableShape.cs
@@ -36,7 +36,7 @@ public partial class NullableShape : IValidatableObject
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public NullableShape(Triangle triangle)
+        internal NullableShape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -46,7 +46,7 @@ public NullableShape(Triangle triangle)
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public NullableShape(Quadrilateral quadrilateral)
+        internal NullableShape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -126,8 +126,6 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string?> shapeType = default;
-
             Quadrilateral? quadrilateral = null;
             Triangle? triangle = null;
 
@@ -176,21 +174,12 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string?>(utf8JsonReader.GetString()!);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class NullableShape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class NullableShape.");
-
             if (quadrilateral != null)
                 return new NullableShape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/Shape.cs
index 71620d915bbb..6e33d5b7ef54 100644
--- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/Shape.cs
+++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/Shape.cs
@@ -36,7 +36,7 @@ public partial class Shape : IValidatableObject
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public Shape(Triangle triangle)
+        internal Shape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -46,7 +46,7 @@ public Shape(Triangle triangle)
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public Shape(Quadrilateral quadrilateral)
+        internal Shape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -126,8 +126,6 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string?> shapeType = default;
-
             Quadrilateral? quadrilateral = null;
             Triangle? triangle = null;
 
@@ -176,21 +174,12 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string?>(utf8JsonReader.GetString()!);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class Shape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class Shape.");
-
             if (quadrilateral != null)
                 return new Shape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/ShapeOrNull.cs
index 37b5fddee5e3..7cd9753f1eed 100644
--- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/ShapeOrNull.cs
+++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/ShapeOrNull.cs
@@ -36,7 +36,7 @@ public partial class ShapeOrNull : IValidatableObject
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public ShapeOrNull(Triangle triangle)
+        internal ShapeOrNull(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -46,7 +46,7 @@ public ShapeOrNull(Triangle triangle)
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public ShapeOrNull(Quadrilateral quadrilateral)
+        internal ShapeOrNull(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -126,8 +126,6 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string?> shapeType = default;
-
             Quadrilateral? quadrilateral = null;
             Triangle? triangle = null;
 
@@ -176,21 +174,12 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string?>(utf8JsonReader.GetString()!);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class ShapeOrNull.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class ShapeOrNull.");
-
             if (quadrilateral != null)
                 return new ShapeOrNull(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/NullableShape.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/NullableShape.md
index 2720167ccaaa..0caa1aa5b9d8 100644
--- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/NullableShape.md
+++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/NullableShape.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Shape.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Shape.md
index ae75c5925401..cd9e7e1499d2 100644
--- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Shape.md
+++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Shape.md
@@ -4,7 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ShapeOrNull.md
index 7fcd31a3a5e1..1bd04583c9a0 100644
--- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ShapeOrNull.md
@@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs
index 9a93cb734e9c..7aaf53bf6227 100644
--- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs
+++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs
@@ -33,7 +33,7 @@ public partial class NullableShape : IValidatableObject
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public NullableShape(Triangle triangle)
+        internal NullableShape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public NullableShape(Triangle triangle)
         /// Initializes a new instance of the <see cref="NullableShape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public NullableShape(Quadrilateral quadrilateral)
+        internal NullableShape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override NullableShape Read(ref Utf8JsonReader utf8JsonReader, Type typeT
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class NullableShape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class NullableShape.");
-
             if (quadrilateral != null)
                 return new NullableShape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Shape.cs
index c651ac7d2454..ab82878ee393 100644
--- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Shape.cs
+++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Shape.cs
@@ -33,7 +33,7 @@ public partial class Shape : IValidatableObject
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public Shape(Triangle triangle)
+        internal Shape(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public Shape(Triangle triangle)
         /// Initializes a new instance of the <see cref="Shape" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public Shape(Quadrilateral quadrilateral)
+        internal Shape(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override Shape Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class Shape.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class Shape.");
-
             if (quadrilateral != null)
                 return new Shape(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs
index 1f0b22030070..f83d9bc6bec3 100644
--- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs
+++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs
@@ -33,7 +33,7 @@ public partial class ShapeOrNull : IValidatableObject
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="triangle"></param>
-        public ShapeOrNull(Triangle triangle)
+        internal ShapeOrNull(Triangle triangle)
         {
             Triangle = triangle;
             OnCreated();
@@ -43,7 +43,7 @@ public ShapeOrNull(Triangle triangle)
         /// Initializes a new instance of the <see cref="ShapeOrNull" /> class.
         /// </summary>
         /// <param name="quadrilateral"></param>
-        public ShapeOrNull(Quadrilateral quadrilateral)
+        internal ShapeOrNull(Quadrilateral quadrilateral)
         {
             Quadrilateral = quadrilateral;
             OnCreated();
@@ -123,8 +123,6 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> shapeType = default;
-
             Quadrilateral quadrilateral = null;
             Triangle triangle = null;
 
@@ -173,21 +171,12 @@ public override ShapeOrNull Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "shapeType":
-                            shapeType = new Option<string>(utf8JsonReader.GetString());
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            if (!shapeType.IsSet)
-                throw new ArgumentException("Property is required for class ShapeOrNull.", nameof(shapeType));
-
-            if (shapeType.IsSet && shapeType.Value == null)
-                throw new ArgumentNullException(nameof(shapeType), "Property is not nullable for class ShapeOrNull.");
-
             if (quadrilateral != null)
                 return new ShapeOrNull(quadrilateral);
 
diff --git a/samples/client/petstore/csharp/httpclient/net10/Petstore/docs/NullableShape.md b/samples/client/petstore/csharp/httpclient/net10/Petstore/docs/NullableShape.md
index 2656339e9d36..0aa093e5c45a 100644
--- a/samples/client/petstore/csharp/httpclient/net10/Petstore/docs/NullableShape.md
+++ b/samples/client/petstore/csharp/httpclient/net10/Petstore/docs/NullableShape.md
@@ -5,9 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/httpclient/net10/Petstore/docs/Shape.md b/samples/client/petstore/csharp/httpclient/net10/Petstore/docs/Shape.md
index ced6864c4438..66bd5dbcb637 100644
--- a/samples/client/petstore/csharp/httpclient/net10/Petstore/docs/Shape.md
+++ b/samples/client/petstore/csharp/httpclient/net10/Petstore/docs/Shape.md
@@ -4,9 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/httpclient/net10/Petstore/docs/ShapeOrNull.md b/samples/client/petstore/csharp/httpclient/net10/Petstore/docs/ShapeOrNull.md
index ba986aa32e5c..c020d45530ba 100644
--- a/samples/client/petstore/csharp/httpclient/net10/Petstore/docs/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/httpclient/net10/Petstore/docs/ShapeOrNull.md
@@ -5,9 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/docs/NullableShape.md b/samples/client/petstore/csharp/httpclient/net9/Petstore/docs/NullableShape.md
index 2656339e9d36..0aa093e5c45a 100644
--- a/samples/client/petstore/csharp/httpclient/net9/Petstore/docs/NullableShape.md
+++ b/samples/client/petstore/csharp/httpclient/net9/Petstore/docs/NullableShape.md
@@ -5,9 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/docs/Shape.md b/samples/client/petstore/csharp/httpclient/net9/Petstore/docs/Shape.md
index ced6864c4438..66bd5dbcb637 100644
--- a/samples/client/petstore/csharp/httpclient/net9/Petstore/docs/Shape.md
+++ b/samples/client/petstore/csharp/httpclient/net9/Petstore/docs/Shape.md
@@ -4,9 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/docs/ShapeOrNull.md b/samples/client/petstore/csharp/httpclient/net9/Petstore/docs/ShapeOrNull.md
index ba986aa32e5c..c020d45530ba 100644
--- a/samples/client/petstore/csharp/httpclient/net9/Petstore/docs/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/httpclient/net9/Petstore/docs/ShapeOrNull.md
@@ -5,9 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/NullableShape.md b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/NullableShape.md
index 2656339e9d36..0aa093e5c45a 100644
--- a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/NullableShape.md
+++ b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/NullableShape.md
@@ -5,9 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/Shape.md b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/Shape.md
index ced6864c4438..66bd5dbcb637 100644
--- a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/Shape.md
+++ b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/Shape.md
@@ -4,9 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/ShapeOrNull.md b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/ShapeOrNull.md
index ba986aa32e5c..c020d45530ba 100644
--- a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/ShapeOrNull.md
@@ -5,9 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/restsharp/net10/Petstore/docs/NullableShape.md b/samples/client/petstore/csharp/restsharp/net10/Petstore/docs/NullableShape.md
index 2656339e9d36..0aa093e5c45a 100644
--- a/samples/client/petstore/csharp/restsharp/net10/Petstore/docs/NullableShape.md
+++ b/samples/client/petstore/csharp/restsharp/net10/Petstore/docs/NullableShape.md
@@ -5,9 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/restsharp/net10/Petstore/docs/Shape.md b/samples/client/petstore/csharp/restsharp/net10/Petstore/docs/Shape.md
index ced6864c4438..66bd5dbcb637 100644
--- a/samples/client/petstore/csharp/restsharp/net10/Petstore/docs/Shape.md
+++ b/samples/client/petstore/csharp/restsharp/net10/Petstore/docs/Shape.md
@@ -4,9 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/restsharp/net10/Petstore/docs/ShapeOrNull.md b/samples/client/petstore/csharp/restsharp/net10/Petstore/docs/ShapeOrNull.md
index ba986aa32e5c..c020d45530ba 100644
--- a/samples/client/petstore/csharp/restsharp/net10/Petstore/docs/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/restsharp/net10/Petstore/docs/ShapeOrNull.md
@@ -5,9 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/restsharp/net4.7/Petstore/docs/NullableShape.md b/samples/client/petstore/csharp/restsharp/net4.7/Petstore/docs/NullableShape.md
index 2656339e9d36..0aa093e5c45a 100644
--- a/samples/client/petstore/csharp/restsharp/net4.7/Petstore/docs/NullableShape.md
+++ b/samples/client/petstore/csharp/restsharp/net4.7/Petstore/docs/NullableShape.md
@@ -5,9 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/restsharp/net4.7/Petstore/docs/Shape.md b/samples/client/petstore/csharp/restsharp/net4.7/Petstore/docs/Shape.md
index ced6864c4438..66bd5dbcb637 100644
--- a/samples/client/petstore/csharp/restsharp/net4.7/Petstore/docs/Shape.md
+++ b/samples/client/petstore/csharp/restsharp/net4.7/Petstore/docs/Shape.md
@@ -4,9 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/restsharp/net4.7/Petstore/docs/ShapeOrNull.md b/samples/client/petstore/csharp/restsharp/net4.7/Petstore/docs/ShapeOrNull.md
index ba986aa32e5c..c020d45530ba 100644
--- a/samples/client/petstore/csharp/restsharp/net4.7/Petstore/docs/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/restsharp/net4.7/Petstore/docs/ShapeOrNull.md
@@ -5,9 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/restsharp/net4.8/Petstore/docs/NullableShape.md b/samples/client/petstore/csharp/restsharp/net4.8/Petstore/docs/NullableShape.md
index 2656339e9d36..0aa093e5c45a 100644
--- a/samples/client/petstore/csharp/restsharp/net4.8/Petstore/docs/NullableShape.md
+++ b/samples/client/petstore/csharp/restsharp/net4.8/Petstore/docs/NullableShape.md
@@ -5,9 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/restsharp/net4.8/Petstore/docs/Shape.md b/samples/client/petstore/csharp/restsharp/net4.8/Petstore/docs/Shape.md
index ced6864c4438..66bd5dbcb637 100644
--- a/samples/client/petstore/csharp/restsharp/net4.8/Petstore/docs/Shape.md
+++ b/samples/client/petstore/csharp/restsharp/net4.8/Petstore/docs/Shape.md
@@ -4,9 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/restsharp/net4.8/Petstore/docs/ShapeOrNull.md b/samples/client/petstore/csharp/restsharp/net4.8/Petstore/docs/ShapeOrNull.md
index ba986aa32e5c..c020d45530ba 100644
--- a/samples/client/petstore/csharp/restsharp/net4.8/Petstore/docs/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/restsharp/net4.8/Petstore/docs/ShapeOrNull.md
@@ -5,9 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/restsharp/net8/EnumMappings/docs/NullableShape.md b/samples/client/petstore/csharp/restsharp/net8/EnumMappings/docs/NullableShape.md
index 2656339e9d36..0aa093e5c45a 100644
--- a/samples/client/petstore/csharp/restsharp/net8/EnumMappings/docs/NullableShape.md
+++ b/samples/client/petstore/csharp/restsharp/net8/EnumMappings/docs/NullableShape.md
@@ -5,9 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/restsharp/net8/EnumMappings/docs/Shape.md b/samples/client/petstore/csharp/restsharp/net8/EnumMappings/docs/Shape.md
index ced6864c4438..66bd5dbcb637 100644
--- a/samples/client/petstore/csharp/restsharp/net8/EnumMappings/docs/Shape.md
+++ b/samples/client/petstore/csharp/restsharp/net8/EnumMappings/docs/Shape.md
@@ -4,9 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/restsharp/net8/EnumMappings/docs/ShapeOrNull.md b/samples/client/petstore/csharp/restsharp/net8/EnumMappings/docs/ShapeOrNull.md
index ba986aa32e5c..c020d45530ba 100644
--- a/samples/client/petstore/csharp/restsharp/net8/EnumMappings/docs/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/restsharp/net8/EnumMappings/docs/ShapeOrNull.md
@@ -5,9 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/docs/NullableShape.md b/samples/client/petstore/csharp/restsharp/net8/Petstore/docs/NullableShape.md
index 2656339e9d36..0aa093e5c45a 100644
--- a/samples/client/petstore/csharp/restsharp/net8/Petstore/docs/NullableShape.md
+++ b/samples/client/petstore/csharp/restsharp/net8/Petstore/docs/NullableShape.md
@@ -5,9 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/docs/Shape.md b/samples/client/petstore/csharp/restsharp/net8/Petstore/docs/Shape.md
index ced6864c4438..66bd5dbcb637 100644
--- a/samples/client/petstore/csharp/restsharp/net8/Petstore/docs/Shape.md
+++ b/samples/client/petstore/csharp/restsharp/net8/Petstore/docs/Shape.md
@@ -4,9 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/docs/ShapeOrNull.md b/samples/client/petstore/csharp/restsharp/net8/Petstore/docs/ShapeOrNull.md
index ba986aa32e5c..c020d45530ba 100644
--- a/samples/client/petstore/csharp/restsharp/net8/Petstore/docs/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/restsharp/net8/Petstore/docs/ShapeOrNull.md
@@ -5,9 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/restsharp/net9/EnumMappings/docs/NullableShape.md b/samples/client/petstore/csharp/restsharp/net9/EnumMappings/docs/NullableShape.md
index 2656339e9d36..0aa093e5c45a 100644
--- a/samples/client/petstore/csharp/restsharp/net9/EnumMappings/docs/NullableShape.md
+++ b/samples/client/petstore/csharp/restsharp/net9/EnumMappings/docs/NullableShape.md
@@ -5,9 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/restsharp/net9/EnumMappings/docs/Shape.md b/samples/client/petstore/csharp/restsharp/net9/EnumMappings/docs/Shape.md
index ced6864c4438..66bd5dbcb637 100644
--- a/samples/client/petstore/csharp/restsharp/net9/EnumMappings/docs/Shape.md
+++ b/samples/client/petstore/csharp/restsharp/net9/EnumMappings/docs/Shape.md
@@ -4,9 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/restsharp/net9/EnumMappings/docs/ShapeOrNull.md b/samples/client/petstore/csharp/restsharp/net9/EnumMappings/docs/ShapeOrNull.md
index ba986aa32e5c..c020d45530ba 100644
--- a/samples/client/petstore/csharp/restsharp/net9/EnumMappings/docs/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/restsharp/net9/EnumMappings/docs/ShapeOrNull.md
@@ -5,9 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/NullableShape.md b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/NullableShape.md
index 2656339e9d36..0aa093e5c45a 100644
--- a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/NullableShape.md
+++ b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/NullableShape.md
@@ -5,9 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/Shape.md b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/Shape.md
index ced6864c4438..66bd5dbcb637 100644
--- a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/Shape.md
+++ b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/Shape.md
@@ -4,9 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/ShapeOrNull.md b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/ShapeOrNull.md
index ba986aa32e5c..c020d45530ba 100644
--- a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/ShapeOrNull.md
@@ -5,9 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/Petstore/docs/NullableShape.md b/samples/client/petstore/csharp/restsharp/standard2.0/Petstore/docs/NullableShape.md
index 2656339e9d36..0aa093e5c45a 100644
--- a/samples/client/petstore/csharp/restsharp/standard2.0/Petstore/docs/NullableShape.md
+++ b/samples/client/petstore/csharp/restsharp/standard2.0/Petstore/docs/NullableShape.md
@@ -5,9 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/Petstore/docs/Shape.md b/samples/client/petstore/csharp/restsharp/standard2.0/Petstore/docs/Shape.md
index ced6864c4438..66bd5dbcb637 100644
--- a/samples/client/petstore/csharp/restsharp/standard2.0/Petstore/docs/Shape.md
+++ b/samples/client/petstore/csharp/restsharp/standard2.0/Petstore/docs/Shape.md
@@ -4,9 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/Petstore/docs/ShapeOrNull.md b/samples/client/petstore/csharp/restsharp/standard2.0/Petstore/docs/ShapeOrNull.md
index ba986aa32e5c..c020d45530ba 100644
--- a/samples/client/petstore/csharp/restsharp/standard2.0/Petstore/docs/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/restsharp/standard2.0/Petstore/docs/ShapeOrNull.md
@@ -5,9 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/unityWebRequest/net10/Petstore/docs/NullableShape.md b/samples/client/petstore/csharp/unityWebRequest/net10/Petstore/docs/NullableShape.md
index 2656339e9d36..0aa093e5c45a 100644
--- a/samples/client/petstore/csharp/unityWebRequest/net10/Petstore/docs/NullableShape.md
+++ b/samples/client/petstore/csharp/unityWebRequest/net10/Petstore/docs/NullableShape.md
@@ -5,9 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/unityWebRequest/net10/Petstore/docs/Shape.md b/samples/client/petstore/csharp/unityWebRequest/net10/Petstore/docs/Shape.md
index ced6864c4438..66bd5dbcb637 100644
--- a/samples/client/petstore/csharp/unityWebRequest/net10/Petstore/docs/Shape.md
+++ b/samples/client/petstore/csharp/unityWebRequest/net10/Petstore/docs/Shape.md
@@ -4,9 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/unityWebRequest/net10/Petstore/docs/ShapeOrNull.md b/samples/client/petstore/csharp/unityWebRequest/net10/Petstore/docs/ShapeOrNull.md
index ba986aa32e5c..c020d45530ba 100644
--- a/samples/client/petstore/csharp/unityWebRequest/net10/Petstore/docs/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/unityWebRequest/net10/Petstore/docs/ShapeOrNull.md
@@ -5,9 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/NullableShape.md b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/NullableShape.md
index 2656339e9d36..0aa093e5c45a 100644
--- a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/NullableShape.md
+++ b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/NullableShape.md
@@ -5,9 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/Shape.md b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/Shape.md
index ced6864c4438..66bd5dbcb637 100644
--- a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/Shape.md
+++ b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/Shape.md
@@ -4,9 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/ShapeOrNull.md b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/ShapeOrNull.md
index ba986aa32e5c..c020d45530ba 100644
--- a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/ShapeOrNull.md
@@ -5,9 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/NullableShape.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/NullableShape.md
index 2656339e9d36..0aa093e5c45a 100644
--- a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/NullableShape.md
+++ b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/NullableShape.md
@@ -5,9 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/Shape.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/Shape.md
index ced6864c4438..66bd5dbcb637 100644
--- a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/Shape.md
+++ b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/Shape.md
@@ -4,9 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/ShapeOrNull.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/ShapeOrNull.md
index ba986aa32e5c..c020d45530ba 100644
--- a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/ShapeOrNull.md
+++ b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/ShapeOrNull.md
@@ -5,9 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **string** |  | 
-**TriangleType** | **string** |  | 
-**QuadrilateralType** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableShape.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableShape.java
index f37075699d82..2265fa6d4a3a 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableShape.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableShape.java
@@ -23,14 +23,8 @@
 import java.util.Map;
 import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.Arrays;
 import org.openapitools.client.model.Quadrilateral;
 import org.openapitools.client.model.Triangle;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Shape.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Shape.java
index dedc0fc269df..f8d7fdeac5ca 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Shape.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Shape.java
@@ -23,14 +23,8 @@
 import java.util.Map;
 import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.Arrays;
 import org.openapitools.client.model.Quadrilateral;
 import org.openapitools.client.model.Triangle;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ShapeOrNull.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ShapeOrNull.java
index 0f92751d55bd..b5831316b528 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ShapeOrNull.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ShapeOrNull.java
@@ -23,14 +23,8 @@
 import java.util.Map;
 import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.Arrays;
 import org.openapitools.client.model.Quadrilateral;
 import org.openapitools.client.model.Triangle;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableShape.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableShape.java
index bb28cc325ad2..f301bd9ace6d 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableShape.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableShape.java
@@ -20,14 +20,8 @@
 import java.util.Map;
 import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.Arrays;
 import org.openapitools.client.model.Quadrilateral;
 import org.openapitools.client.model.Triangle;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Shape.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Shape.java
index d3828d6e2559..7001ed8b0432 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Shape.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Shape.java
@@ -20,14 +20,8 @@
 import java.util.Map;
 import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.Arrays;
 import org.openapitools.client.model.Quadrilateral;
 import org.openapitools.client.model.Triangle;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ShapeOrNull.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ShapeOrNull.java
index ff840f4652ba..0139b896066c 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ShapeOrNull.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ShapeOrNull.java
@@ -20,14 +20,8 @@
 import java.util.Map;
 import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.Arrays;
 import org.openapitools.client.model.Quadrilateral;
 import org.openapitools.client.model.Triangle;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
diff --git a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/NullableShape.java b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/NullableShape.java
index 4b6c9199ca2f..736cd1b1d916 100644
--- a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/NullableShape.java
+++ b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/NullableShape.java
@@ -22,13 +22,8 @@
 import java.util.Map;
 import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.Arrays;
 import org.openapitools.client.model.Quadrilateral;
 import org.openapitools.client.model.Triangle;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
diff --git a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Shape.java b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Shape.java
index 1c237437d095..de6acf19a501 100644
--- a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Shape.java
+++ b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Shape.java
@@ -22,13 +22,8 @@
 import java.util.Map;
 import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.Arrays;
 import org.openapitools.client.model.Quadrilateral;
 import org.openapitools.client.model.Triangle;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
diff --git a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/ShapeOrNull.java b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/ShapeOrNull.java
index f0711ec67788..2aece8ad8813 100644
--- a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/ShapeOrNull.java
+++ b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/ShapeOrNull.java
@@ -22,13 +22,8 @@
 import java.util.Map;
 import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.Arrays;
 import org.openapitools.client.model.Quadrilateral;
 import org.openapitools.client.model.Triangle;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableShape.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableShape.java
index 5b3437523c75..cdcf0ebc1fa9 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableShape.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableShape.java
@@ -22,14 +22,8 @@
 import java.util.Map;
 import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.Arrays;
 import org.openapitools.client.model.Quadrilateral;
 import org.openapitools.client.model.Triangle;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Shape.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Shape.java
index 92485be6ef39..1198c4939417 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Shape.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Shape.java
@@ -22,14 +22,8 @@
 import java.util.Map;
 import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.Arrays;
 import org.openapitools.client.model.Quadrilateral;
 import org.openapitools.client.model.Triangle;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ShapeOrNull.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ShapeOrNull.java
index 89b00bc59124..005618368520 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ShapeOrNull.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ShapeOrNull.java
@@ -22,14 +22,8 @@
 import java.util.Map;
 import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.Arrays;
 import org.openapitools.client.model.Quadrilateral;
 import org.openapitools.client.model.Triangle;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
diff --git a/samples/client/petstore/java/okhttp-gson/docs/NullableShape.md b/samples/client/petstore/java/okhttp-gson/docs/NullableShape.md
index 9d40680fd2c2..a76dfc1d46e2 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/NullableShape.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/NullableShape.md
@@ -8,9 +8,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**shapeType** | **String** |  |  |
-|**triangleType** | **String** |  |  |
-|**quadrilateralType** | **String** |  |  |
 
 
 
diff --git a/samples/client/petstore/java/okhttp-gson/docs/Shape.md b/samples/client/petstore/java/okhttp-gson/docs/Shape.md
index 51549d7b67f9..64301c610cd3 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/Shape.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/Shape.md
@@ -7,9 +7,6 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**shapeType** | **String** |  |  |
-|**triangleType** | **String** |  |  |
-|**quadrilateralType** | **String** |  |  |
 
 
 
diff --git a/samples/client/petstore/java/okhttp-gson/docs/ShapeOrNull.md b/samples/client/petstore/java/okhttp-gson/docs/ShapeOrNull.md
index c4ae8f1b6720..3b91cae72c95 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/ShapeOrNull.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/ShapeOrNull.md
@@ -8,9 +8,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema >
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**shapeType** | **String** |  |  |
-|**triangleType** | **String** |  |  |
-|**quadrilateralType** | **String** |  |  |
 
 
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NullableShape.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NullableShape.java
index b487fd231052..ecd9565bdce5 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NullableShape.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NullableShape.java
@@ -14,13 +14,6 @@
 package org.openapitools.client.model;
 
 import java.util.Objects;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import java.io.IOException;
-import java.util.Arrays;
 import org.openapitools.client.model.Quadrilateral;
 import org.openapitools.client.model.Triangle;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Shape.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Shape.java
index 62cc65090d1d..834a298209f8 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Shape.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Shape.java
@@ -14,13 +14,6 @@
 package org.openapitools.client.model;
 
 import java.util.Objects;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import java.io.IOException;
-import java.util.Arrays;
 import org.openapitools.client.model.Quadrilateral;
 import org.openapitools.client.model.Triangle;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ShapeOrNull.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ShapeOrNull.java
index 30a15b50f64c..594833969257 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ShapeOrNull.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ShapeOrNull.java
@@ -14,13 +14,6 @@
 package org.openapitools.client.model;
 
 import java.util.Objects;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import java.io.IOException;
-import java.util.Arrays;
 import org.openapitools.client.model.Quadrilateral;
 import org.openapitools.client.model.Triangle;
 
diff --git a/samples/client/petstore/powershell/docs/NullableShape.md b/samples/client/petstore/powershell/docs/NullableShape.md
index 127110ad1c0d..bbc9232aa860 100644
--- a/samples/client/petstore/powershell/docs/NullableShape.md
+++ b/samples/client/petstore/powershell/docs/NullableShape.md
@@ -3,17 +3,12 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **String** |  | 
-**TriangleType** | **String** |  | 
-**QuadrilateralType** | **String** |  | 
 
 ## Examples
 
 - Prepare the resource
 ```powershell
-$NullableShape = Initialize-PSPetstoreNullableShape  -ShapeType null `
- -TriangleType null `
- -QuadrilateralType null
+$NullableShape = Initialize-PSPetstoreNullableShape 
 ```
 
 - Convert the resource to JSON
diff --git a/samples/client/petstore/powershell/docs/Shape.md b/samples/client/petstore/powershell/docs/Shape.md
index 42b008286a5d..0dc824933cf8 100644
--- a/samples/client/petstore/powershell/docs/Shape.md
+++ b/samples/client/petstore/powershell/docs/Shape.md
@@ -3,17 +3,12 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **String** |  | 
-**TriangleType** | **String** |  | 
-**QuadrilateralType** | **String** |  | 
 
 ## Examples
 
 - Prepare the resource
 ```powershell
-$Shape = Initialize-PSPetstoreShape  -ShapeType null `
- -TriangleType null `
- -QuadrilateralType null
+$Shape = Initialize-PSPetstoreShape 
 ```
 
 - Convert the resource to JSON
diff --git a/samples/client/petstore/powershell/docs/ShapeOrNull.md b/samples/client/petstore/powershell/docs/ShapeOrNull.md
index e237db3c1155..6650940e8547 100644
--- a/samples/client/petstore/powershell/docs/ShapeOrNull.md
+++ b/samples/client/petstore/powershell/docs/ShapeOrNull.md
@@ -3,17 +3,12 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ShapeType** | **String** |  | 
-**TriangleType** | **String** |  | 
-**QuadrilateralType** | **String** |  | 
 
 ## Examples
 
 - Prepare the resource
 ```powershell
-$ShapeOrNull = Initialize-PSPetstoreShapeOrNull  -ShapeType null `
- -TriangleType null `
- -QuadrilateralType null
+$ShapeOrNull = Initialize-PSPetstoreShapeOrNull 
 ```
 
 - Convert the resource to JSON
diff --git a/samples/client/petstore/typescript-axios/builds/test-petstore/docs/NullableShape.md b/samples/client/petstore/typescript-axios/builds/test-petstore/docs/NullableShape.md
index 80f70ecefa53..5625c99e0165 100644
--- a/samples/client/petstore/typescript-axios/builds/test-petstore/docs/NullableShape.md
+++ b/samples/client/petstore/typescript-axios/builds/test-petstore/docs/NullableShape.md
@@ -6,9 +6,6 @@ The value may be a shape or the \'null\' value. The \'nullable\' attribute was i
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**shapeType** | **string** |  | [default to undefined]
-**triangleType** | **string** |  | [default to undefined]
-**quadrilateralType** | **string** |  | [default to undefined]
 
 ## Example
 
@@ -16,9 +13,6 @@ Name | Type | Description | Notes
 import { NullableShape } from './api';
 
 const instance: NullableShape = {
-    shapeType,
-    triangleType,
-    quadrilateralType,
 };
 ```
 
diff --git a/samples/client/petstore/typescript-axios/builds/test-petstore/docs/Shape.md b/samples/client/petstore/typescript-axios/builds/test-petstore/docs/Shape.md
index e135140f28cd..4a2d94226efb 100644
--- a/samples/client/petstore/typescript-axios/builds/test-petstore/docs/Shape.md
+++ b/samples/client/petstore/typescript-axios/builds/test-petstore/docs/Shape.md
@@ -5,9 +5,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**shapeType** | **string** |  | [default to undefined]
-**triangleType** | **string** |  | [default to undefined]
-**quadrilateralType** | **string** |  | [default to undefined]
 
 ## Example
 
@@ -15,9 +12,6 @@ Name | Type | Description | Notes
 import { Shape } from './api';
 
 const instance: Shape = {
-    shapeType,
-    triangleType,
-    quadrilateralType,
 };
 ```
 
diff --git a/samples/client/petstore/typescript-axios/builds/test-petstore/docs/ShapeOrNull.md b/samples/client/petstore/typescript-axios/builds/test-petstore/docs/ShapeOrNull.md
index 79f281d4a005..580d45a11df0 100644
--- a/samples/client/petstore/typescript-axios/builds/test-petstore/docs/ShapeOrNull.md
+++ b/samples/client/petstore/typescript-axios/builds/test-petstore/docs/ShapeOrNull.md
@@ -6,9 +6,6 @@ The value may be a shape or the \'null\' value. This is introduced in OAS schema
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**shapeType** | **string** |  | [default to undefined]
-**triangleType** | **string** |  | [default to undefined]
-**quadrilateralType** | **string** |  | [default to undefined]
 
 ## Example
 
@@ -16,9 +13,6 @@ Name | Type | Description | Notes
 import { ShapeOrNull } from './api';
 
 const instance: ShapeOrNull = {
-    shapeType,
-    triangleType,
-    quadrilateralType,
 };
 ```
 
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableShape.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableShape.java
index b0874184bdbb..d18c12b35aa3 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableShape.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableShape.java
@@ -23,14 +23,8 @@
 import java.util.Map;
 import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.Arrays;
 import org.openapitools.client.model.Quadrilateral;
 import org.openapitools.client.model.Triangle;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Shape.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Shape.java
index 8c8904a46016..755b49411a5c 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Shape.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Shape.java
@@ -23,14 +23,8 @@
 import java.util.Map;
 import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.Arrays;
 import org.openapitools.client.model.Quadrilateral;
 import org.openapitools.client.model.Triangle;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeOrNull.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeOrNull.java
index dec0a11fb61c..46d641d33517 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeOrNull.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeOrNull.java
@@ -23,14 +23,8 @@
 import java.util.Map;
 import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.Arrays;
 import org.openapitools.client.model.Quadrilateral;
 import org.openapitools.client.model.Triangle;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;