diff --git a/modules/swagger-codegen/src/main/resources/swift3/Models.mustache b/modules/swagger-codegen/src/main/resources/swift3/Models.mustache
index b61de1b313..9aef245093 100644
--- a/modules/swagger-codegen/src/main/resources/swift3/Models.mustache
+++ b/modules/swagger-codegen/src/main/resources/swift3/Models.mustache
@@ -251,10 +251,7 @@ class Decoders {
             }
         } {{#models}}{{#model}}
 
-{{^isArrayModel}}
-        // Decoder for [{{{classname}}}]
-            return Decoders.decode(clazz: [{{{classname}}}].self, source: source, instance: instance)
-        }
+{{^isArrayModel}}        
         // Decoder for {{{classname}}}
         Decoders.addDecoder(clazz: {{{classname}}}.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<{{{classname}}}> in
 {{#isEnum}}
diff --git a/samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/Models.swift b/samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/Models.swift
index 930bf97ff0..0ff0ce5458 100644
--- a/samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/Models.swift
+++ b/samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/Models.swift
@@ -251,9 +251,6 @@ class Decoders {
             }
         } 
 
-        // Decoder for [AdditionalPropertiesClass]
-            return Decoders.decode(clazz: [AdditionalPropertiesClass].self, source: source, instance: instance)
-        }
         // Decoder for AdditionalPropertiesClass
         Decoders.addDecoder(clazz: AdditionalPropertiesClass.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<AdditionalPropertiesClass> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -277,9 +274,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Animal]
-            return Decoders.decode(clazz: [Animal].self, source: source, instance: instance)
-        }
         // Decoder for Animal
         Decoders.addDecoder(clazz: Animal.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Animal> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -310,9 +304,6 @@ class Decoders {
 
 
 
-        // Decoder for [ApiResponse]
-            return Decoders.decode(clazz: [ApiResponse].self, source: source, instance: instance)
-        }
         // Decoder for ApiResponse
         Decoders.addDecoder(clazz: ApiResponse.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<ApiResponse> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -342,9 +333,6 @@ class Decoders {
         }
 
 
-        // Decoder for [ArrayOfArrayOfNumberOnly]
-            return Decoders.decode(clazz: [ArrayOfArrayOfNumberOnly].self, source: source, instance: instance)
-        }
         // Decoder for ArrayOfArrayOfNumberOnly
         Decoders.addDecoder(clazz: ArrayOfArrayOfNumberOnly.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<ArrayOfArrayOfNumberOnly> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -362,9 +350,6 @@ class Decoders {
         }
 
 
-        // Decoder for [ArrayOfNumberOnly]
-            return Decoders.decode(clazz: [ArrayOfNumberOnly].self, source: source, instance: instance)
-        }
         // Decoder for ArrayOfNumberOnly
         Decoders.addDecoder(clazz: ArrayOfNumberOnly.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<ArrayOfNumberOnly> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -382,9 +367,6 @@ class Decoders {
         }
 
 
-        // Decoder for [ArrayTest]
-            return Decoders.decode(clazz: [ArrayTest].self, source: source, instance: instance)
-        }
         // Decoder for ArrayTest
         Decoders.addDecoder(clazz: ArrayTest.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<ArrayTest> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -414,9 +396,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Capitalization]
-            return Decoders.decode(clazz: [Capitalization].self, source: source, instance: instance)
-        }
         // Decoder for Capitalization
         Decoders.addDecoder(clazz: Capitalization.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Capitalization> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -464,9 +443,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Cat]
-            return Decoders.decode(clazz: [Cat].self, source: source, instance: instance)
-        }
         // Decoder for Cat
         Decoders.addDecoder(clazz: Cat.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Cat> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -499,9 +475,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Category]
-            return Decoders.decode(clazz: [Category].self, source: source, instance: instance)
-        }
         // Decoder for Category
         Decoders.addDecoder(clazz: Category.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Category> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -525,9 +498,6 @@ class Decoders {
         }
 
 
-        // Decoder for [ClassModel]
-            return Decoders.decode(clazz: [ClassModel].self, source: source, instance: instance)
-        }
         // Decoder for ClassModel
         Decoders.addDecoder(clazz: ClassModel.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<ClassModel> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -545,9 +515,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Client]
-            return Decoders.decode(clazz: [Client].self, source: source, instance: instance)
-        }
         // Decoder for Client
         Decoders.addDecoder(clazz: Client.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Client> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -565,9 +532,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Dog]
-            return Decoders.decode(clazz: [Dog].self, source: source, instance: instance)
-        }
         // Decoder for Dog
         Decoders.addDecoder(clazz: Dog.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Dog> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -600,9 +564,6 @@ class Decoders {
         }
 
 
-        // Decoder for [EnumArrays]
-            return Decoders.decode(clazz: [EnumArrays].self, source: source, instance: instance)
-        }
         // Decoder for EnumArrays
         Decoders.addDecoder(clazz: EnumArrays.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<EnumArrays> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -626,9 +587,6 @@ class Decoders {
         }
 
 
-        // Decoder for [EnumClass]
-            return Decoders.decode(clazz: [EnumClass].self, source: source, instance: instance)
-        }
         // Decoder for EnumClass
         Decoders.addDecoder(clazz: EnumClass.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<EnumClass> in
             //TODO: I don't think we need this anymore
@@ -636,9 +594,6 @@ class Decoders {
         }
 
 
-        // Decoder for [EnumTest]
-            return Decoders.decode(clazz: [EnumTest].self, source: source, instance: instance)
-        }
         // Decoder for EnumTest
         Decoders.addDecoder(clazz: EnumTest.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<EnumTest> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -674,9 +629,6 @@ class Decoders {
         }
 
 
-        // Decoder for [FormatTest]
-            return Decoders.decode(clazz: [FormatTest].self, source: source, instance: instance)
-        }
         // Decoder for FormatTest
         Decoders.addDecoder(clazz: FormatTest.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<FormatTest> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -766,9 +718,6 @@ class Decoders {
         }
 
 
-        // Decoder for [HasOnlyReadOnly]
-            return Decoders.decode(clazz: [HasOnlyReadOnly].self, source: source, instance: instance)
-        }
         // Decoder for HasOnlyReadOnly
         Decoders.addDecoder(clazz: HasOnlyReadOnly.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<HasOnlyReadOnly> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -792,9 +741,6 @@ class Decoders {
         }
 
 
-        // Decoder for [List]
-            return Decoders.decode(clazz: [List].self, source: source, instance: instance)
-        }
         // Decoder for List
         Decoders.addDecoder(clazz: List.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<List> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -812,9 +758,6 @@ class Decoders {
         }
 
 
-        // Decoder for [MapTest]
-            return Decoders.decode(clazz: [MapTest].self, source: source, instance: instance)
-        }
         // Decoder for MapTest
         Decoders.addDecoder(clazz: MapTest.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<MapTest> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -838,9 +781,6 @@ class Decoders {
         }
 
 
-        // Decoder for [MixedPropertiesAndAdditionalPropertiesClass]
-            return Decoders.decode(clazz: [MixedPropertiesAndAdditionalPropertiesClass].self, source: source, instance: instance)
-        }
         // Decoder for MixedPropertiesAndAdditionalPropertiesClass
         Decoders.addDecoder(clazz: MixedPropertiesAndAdditionalPropertiesClass.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<MixedPropertiesAndAdditionalPropertiesClass> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -870,9 +810,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Model200Response]
-            return Decoders.decode(clazz: [Model200Response].self, source: source, instance: instance)
-        }
         // Decoder for Model200Response
         Decoders.addDecoder(clazz: Model200Response.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Model200Response> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -896,9 +833,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Name]
-            return Decoders.decode(clazz: [Name].self, source: source, instance: instance)
-        }
         // Decoder for Name
         Decoders.addDecoder(clazz: Name.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Name> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -934,9 +868,6 @@ class Decoders {
         }
 
 
-        // Decoder for [NumberOnly]
-            return Decoders.decode(clazz: [NumberOnly].self, source: source, instance: instance)
-        }
         // Decoder for NumberOnly
         Decoders.addDecoder(clazz: NumberOnly.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<NumberOnly> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -954,9 +885,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Order]
-            return Decoders.decode(clazz: [Order].self, source: source, instance: instance)
-        }
         // Decoder for Order
         Decoders.addDecoder(clazz: Order.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Order> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -1004,9 +932,6 @@ class Decoders {
         }
 
 
-        // Decoder for [OuterEnum]
-            return Decoders.decode(clazz: [OuterEnum].self, source: source, instance: instance)
-        }
         // Decoder for OuterEnum
         Decoders.addDecoder(clazz: OuterEnum.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<OuterEnum> in
             //TODO: I don't think we need this anymore
@@ -1014,9 +939,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Pet]
-            return Decoders.decode(clazz: [Pet].self, source: source, instance: instance)
-        }
         // Decoder for Pet
         Decoders.addDecoder(clazz: Pet.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Pet> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -1064,9 +986,6 @@ class Decoders {
         }
 
 
-        // Decoder for [ReadOnlyFirst]
-            return Decoders.decode(clazz: [ReadOnlyFirst].self, source: source, instance: instance)
-        }
         // Decoder for ReadOnlyFirst
         Decoders.addDecoder(clazz: ReadOnlyFirst.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<ReadOnlyFirst> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -1090,9 +1009,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Return]
-            return Decoders.decode(clazz: [Return].self, source: source, instance: instance)
-        }
         // Decoder for Return
         Decoders.addDecoder(clazz: Return.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Return> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -1110,9 +1026,6 @@ class Decoders {
         }
 
 
-        // Decoder for [SpecialModelName]
-            return Decoders.decode(clazz: [SpecialModelName].self, source: source, instance: instance)
-        }
         // Decoder for SpecialModelName
         Decoders.addDecoder(clazz: SpecialModelName.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<SpecialModelName> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -1130,9 +1043,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Tag]
-            return Decoders.decode(clazz: [Tag].self, source: source, instance: instance)
-        }
         // Decoder for Tag
         Decoders.addDecoder(clazz: Tag.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Tag> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -1156,9 +1066,6 @@ class Decoders {
         }
 
 
-        // Decoder for [User]
-            return Decoders.decode(clazz: [User].self, source: source, instance: instance)
-        }
         // Decoder for User
         Decoders.addDecoder(clazz: User.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<User> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
diff --git a/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models.swift b/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models.swift
index 930bf97ff0..0ff0ce5458 100644
--- a/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models.swift
+++ b/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models.swift
@@ -251,9 +251,6 @@ class Decoders {
             }
         } 
 
-        // Decoder for [AdditionalPropertiesClass]
-            return Decoders.decode(clazz: [AdditionalPropertiesClass].self, source: source, instance: instance)
-        }
         // Decoder for AdditionalPropertiesClass
         Decoders.addDecoder(clazz: AdditionalPropertiesClass.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<AdditionalPropertiesClass> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -277,9 +274,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Animal]
-            return Decoders.decode(clazz: [Animal].self, source: source, instance: instance)
-        }
         // Decoder for Animal
         Decoders.addDecoder(clazz: Animal.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Animal> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -310,9 +304,6 @@ class Decoders {
 
 
 
-        // Decoder for [ApiResponse]
-            return Decoders.decode(clazz: [ApiResponse].self, source: source, instance: instance)
-        }
         // Decoder for ApiResponse
         Decoders.addDecoder(clazz: ApiResponse.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<ApiResponse> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -342,9 +333,6 @@ class Decoders {
         }
 
 
-        // Decoder for [ArrayOfArrayOfNumberOnly]
-            return Decoders.decode(clazz: [ArrayOfArrayOfNumberOnly].self, source: source, instance: instance)
-        }
         // Decoder for ArrayOfArrayOfNumberOnly
         Decoders.addDecoder(clazz: ArrayOfArrayOfNumberOnly.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<ArrayOfArrayOfNumberOnly> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -362,9 +350,6 @@ class Decoders {
         }
 
 
-        // Decoder for [ArrayOfNumberOnly]
-            return Decoders.decode(clazz: [ArrayOfNumberOnly].self, source: source, instance: instance)
-        }
         // Decoder for ArrayOfNumberOnly
         Decoders.addDecoder(clazz: ArrayOfNumberOnly.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<ArrayOfNumberOnly> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -382,9 +367,6 @@ class Decoders {
         }
 
 
-        // Decoder for [ArrayTest]
-            return Decoders.decode(clazz: [ArrayTest].self, source: source, instance: instance)
-        }
         // Decoder for ArrayTest
         Decoders.addDecoder(clazz: ArrayTest.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<ArrayTest> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -414,9 +396,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Capitalization]
-            return Decoders.decode(clazz: [Capitalization].self, source: source, instance: instance)
-        }
         // Decoder for Capitalization
         Decoders.addDecoder(clazz: Capitalization.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Capitalization> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -464,9 +443,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Cat]
-            return Decoders.decode(clazz: [Cat].self, source: source, instance: instance)
-        }
         // Decoder for Cat
         Decoders.addDecoder(clazz: Cat.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Cat> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -499,9 +475,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Category]
-            return Decoders.decode(clazz: [Category].self, source: source, instance: instance)
-        }
         // Decoder for Category
         Decoders.addDecoder(clazz: Category.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Category> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -525,9 +498,6 @@ class Decoders {
         }
 
 
-        // Decoder for [ClassModel]
-            return Decoders.decode(clazz: [ClassModel].self, source: source, instance: instance)
-        }
         // Decoder for ClassModel
         Decoders.addDecoder(clazz: ClassModel.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<ClassModel> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -545,9 +515,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Client]
-            return Decoders.decode(clazz: [Client].self, source: source, instance: instance)
-        }
         // Decoder for Client
         Decoders.addDecoder(clazz: Client.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Client> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -565,9 +532,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Dog]
-            return Decoders.decode(clazz: [Dog].self, source: source, instance: instance)
-        }
         // Decoder for Dog
         Decoders.addDecoder(clazz: Dog.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Dog> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -600,9 +564,6 @@ class Decoders {
         }
 
 
-        // Decoder for [EnumArrays]
-            return Decoders.decode(clazz: [EnumArrays].self, source: source, instance: instance)
-        }
         // Decoder for EnumArrays
         Decoders.addDecoder(clazz: EnumArrays.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<EnumArrays> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -626,9 +587,6 @@ class Decoders {
         }
 
 
-        // Decoder for [EnumClass]
-            return Decoders.decode(clazz: [EnumClass].self, source: source, instance: instance)
-        }
         // Decoder for EnumClass
         Decoders.addDecoder(clazz: EnumClass.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<EnumClass> in
             //TODO: I don't think we need this anymore
@@ -636,9 +594,6 @@ class Decoders {
         }
 
 
-        // Decoder for [EnumTest]
-            return Decoders.decode(clazz: [EnumTest].self, source: source, instance: instance)
-        }
         // Decoder for EnumTest
         Decoders.addDecoder(clazz: EnumTest.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<EnumTest> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -674,9 +629,6 @@ class Decoders {
         }
 
 
-        // Decoder for [FormatTest]
-            return Decoders.decode(clazz: [FormatTest].self, source: source, instance: instance)
-        }
         // Decoder for FormatTest
         Decoders.addDecoder(clazz: FormatTest.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<FormatTest> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -766,9 +718,6 @@ class Decoders {
         }
 
 
-        // Decoder for [HasOnlyReadOnly]
-            return Decoders.decode(clazz: [HasOnlyReadOnly].self, source: source, instance: instance)
-        }
         // Decoder for HasOnlyReadOnly
         Decoders.addDecoder(clazz: HasOnlyReadOnly.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<HasOnlyReadOnly> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -792,9 +741,6 @@ class Decoders {
         }
 
 
-        // Decoder for [List]
-            return Decoders.decode(clazz: [List].self, source: source, instance: instance)
-        }
         // Decoder for List
         Decoders.addDecoder(clazz: List.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<List> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -812,9 +758,6 @@ class Decoders {
         }
 
 
-        // Decoder for [MapTest]
-            return Decoders.decode(clazz: [MapTest].self, source: source, instance: instance)
-        }
         // Decoder for MapTest
         Decoders.addDecoder(clazz: MapTest.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<MapTest> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -838,9 +781,6 @@ class Decoders {
         }
 
 
-        // Decoder for [MixedPropertiesAndAdditionalPropertiesClass]
-            return Decoders.decode(clazz: [MixedPropertiesAndAdditionalPropertiesClass].self, source: source, instance: instance)
-        }
         // Decoder for MixedPropertiesAndAdditionalPropertiesClass
         Decoders.addDecoder(clazz: MixedPropertiesAndAdditionalPropertiesClass.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<MixedPropertiesAndAdditionalPropertiesClass> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -870,9 +810,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Model200Response]
-            return Decoders.decode(clazz: [Model200Response].self, source: source, instance: instance)
-        }
         // Decoder for Model200Response
         Decoders.addDecoder(clazz: Model200Response.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Model200Response> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -896,9 +833,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Name]
-            return Decoders.decode(clazz: [Name].self, source: source, instance: instance)
-        }
         // Decoder for Name
         Decoders.addDecoder(clazz: Name.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Name> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -934,9 +868,6 @@ class Decoders {
         }
 
 
-        // Decoder for [NumberOnly]
-            return Decoders.decode(clazz: [NumberOnly].self, source: source, instance: instance)
-        }
         // Decoder for NumberOnly
         Decoders.addDecoder(clazz: NumberOnly.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<NumberOnly> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -954,9 +885,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Order]
-            return Decoders.decode(clazz: [Order].self, source: source, instance: instance)
-        }
         // Decoder for Order
         Decoders.addDecoder(clazz: Order.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Order> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -1004,9 +932,6 @@ class Decoders {
         }
 
 
-        // Decoder for [OuterEnum]
-            return Decoders.decode(clazz: [OuterEnum].self, source: source, instance: instance)
-        }
         // Decoder for OuterEnum
         Decoders.addDecoder(clazz: OuterEnum.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<OuterEnum> in
             //TODO: I don't think we need this anymore
@@ -1014,9 +939,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Pet]
-            return Decoders.decode(clazz: [Pet].self, source: source, instance: instance)
-        }
         // Decoder for Pet
         Decoders.addDecoder(clazz: Pet.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Pet> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -1064,9 +986,6 @@ class Decoders {
         }
 
 
-        // Decoder for [ReadOnlyFirst]
-            return Decoders.decode(clazz: [ReadOnlyFirst].self, source: source, instance: instance)
-        }
         // Decoder for ReadOnlyFirst
         Decoders.addDecoder(clazz: ReadOnlyFirst.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<ReadOnlyFirst> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -1090,9 +1009,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Return]
-            return Decoders.decode(clazz: [Return].self, source: source, instance: instance)
-        }
         // Decoder for Return
         Decoders.addDecoder(clazz: Return.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Return> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -1110,9 +1026,6 @@ class Decoders {
         }
 
 
-        // Decoder for [SpecialModelName]
-            return Decoders.decode(clazz: [SpecialModelName].self, source: source, instance: instance)
-        }
         // Decoder for SpecialModelName
         Decoders.addDecoder(clazz: SpecialModelName.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<SpecialModelName> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -1130,9 +1043,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Tag]
-            return Decoders.decode(clazz: [Tag].self, source: source, instance: instance)
-        }
         // Decoder for Tag
         Decoders.addDecoder(clazz: Tag.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Tag> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -1156,9 +1066,6 @@ class Decoders {
         }
 
 
-        // Decoder for [User]
-            return Decoders.decode(clazz: [User].self, source: source, instance: instance)
-        }
         // Decoder for User
         Decoders.addDecoder(clazz: User.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<User> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
diff --git a/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/Models.swift b/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/Models.swift
index 930bf97ff0..0ff0ce5458 100644
--- a/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/Models.swift
+++ b/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/Models.swift
@@ -251,9 +251,6 @@ class Decoders {
             }
         } 
 
-        // Decoder for [AdditionalPropertiesClass]
-            return Decoders.decode(clazz: [AdditionalPropertiesClass].self, source: source, instance: instance)
-        }
         // Decoder for AdditionalPropertiesClass
         Decoders.addDecoder(clazz: AdditionalPropertiesClass.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<AdditionalPropertiesClass> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -277,9 +274,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Animal]
-            return Decoders.decode(clazz: [Animal].self, source: source, instance: instance)
-        }
         // Decoder for Animal
         Decoders.addDecoder(clazz: Animal.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Animal> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -310,9 +304,6 @@ class Decoders {
 
 
 
-        // Decoder for [ApiResponse]
-            return Decoders.decode(clazz: [ApiResponse].self, source: source, instance: instance)
-        }
         // Decoder for ApiResponse
         Decoders.addDecoder(clazz: ApiResponse.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<ApiResponse> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -342,9 +333,6 @@ class Decoders {
         }
 
 
-        // Decoder for [ArrayOfArrayOfNumberOnly]
-            return Decoders.decode(clazz: [ArrayOfArrayOfNumberOnly].self, source: source, instance: instance)
-        }
         // Decoder for ArrayOfArrayOfNumberOnly
         Decoders.addDecoder(clazz: ArrayOfArrayOfNumberOnly.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<ArrayOfArrayOfNumberOnly> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -362,9 +350,6 @@ class Decoders {
         }
 
 
-        // Decoder for [ArrayOfNumberOnly]
-            return Decoders.decode(clazz: [ArrayOfNumberOnly].self, source: source, instance: instance)
-        }
         // Decoder for ArrayOfNumberOnly
         Decoders.addDecoder(clazz: ArrayOfNumberOnly.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<ArrayOfNumberOnly> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -382,9 +367,6 @@ class Decoders {
         }
 
 
-        // Decoder for [ArrayTest]
-            return Decoders.decode(clazz: [ArrayTest].self, source: source, instance: instance)
-        }
         // Decoder for ArrayTest
         Decoders.addDecoder(clazz: ArrayTest.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<ArrayTest> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -414,9 +396,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Capitalization]
-            return Decoders.decode(clazz: [Capitalization].self, source: source, instance: instance)
-        }
         // Decoder for Capitalization
         Decoders.addDecoder(clazz: Capitalization.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Capitalization> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -464,9 +443,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Cat]
-            return Decoders.decode(clazz: [Cat].self, source: source, instance: instance)
-        }
         // Decoder for Cat
         Decoders.addDecoder(clazz: Cat.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Cat> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -499,9 +475,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Category]
-            return Decoders.decode(clazz: [Category].self, source: source, instance: instance)
-        }
         // Decoder for Category
         Decoders.addDecoder(clazz: Category.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Category> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -525,9 +498,6 @@ class Decoders {
         }
 
 
-        // Decoder for [ClassModel]
-            return Decoders.decode(clazz: [ClassModel].self, source: source, instance: instance)
-        }
         // Decoder for ClassModel
         Decoders.addDecoder(clazz: ClassModel.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<ClassModel> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -545,9 +515,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Client]
-            return Decoders.decode(clazz: [Client].self, source: source, instance: instance)
-        }
         // Decoder for Client
         Decoders.addDecoder(clazz: Client.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Client> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -565,9 +532,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Dog]
-            return Decoders.decode(clazz: [Dog].self, source: source, instance: instance)
-        }
         // Decoder for Dog
         Decoders.addDecoder(clazz: Dog.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Dog> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -600,9 +564,6 @@ class Decoders {
         }
 
 
-        // Decoder for [EnumArrays]
-            return Decoders.decode(clazz: [EnumArrays].self, source: source, instance: instance)
-        }
         // Decoder for EnumArrays
         Decoders.addDecoder(clazz: EnumArrays.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<EnumArrays> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -626,9 +587,6 @@ class Decoders {
         }
 
 
-        // Decoder for [EnumClass]
-            return Decoders.decode(clazz: [EnumClass].self, source: source, instance: instance)
-        }
         // Decoder for EnumClass
         Decoders.addDecoder(clazz: EnumClass.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<EnumClass> in
             //TODO: I don't think we need this anymore
@@ -636,9 +594,6 @@ class Decoders {
         }
 
 
-        // Decoder for [EnumTest]
-            return Decoders.decode(clazz: [EnumTest].self, source: source, instance: instance)
-        }
         // Decoder for EnumTest
         Decoders.addDecoder(clazz: EnumTest.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<EnumTest> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -674,9 +629,6 @@ class Decoders {
         }
 
 
-        // Decoder for [FormatTest]
-            return Decoders.decode(clazz: [FormatTest].self, source: source, instance: instance)
-        }
         // Decoder for FormatTest
         Decoders.addDecoder(clazz: FormatTest.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<FormatTest> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -766,9 +718,6 @@ class Decoders {
         }
 
 
-        // Decoder for [HasOnlyReadOnly]
-            return Decoders.decode(clazz: [HasOnlyReadOnly].self, source: source, instance: instance)
-        }
         // Decoder for HasOnlyReadOnly
         Decoders.addDecoder(clazz: HasOnlyReadOnly.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<HasOnlyReadOnly> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -792,9 +741,6 @@ class Decoders {
         }
 
 
-        // Decoder for [List]
-            return Decoders.decode(clazz: [List].self, source: source, instance: instance)
-        }
         // Decoder for List
         Decoders.addDecoder(clazz: List.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<List> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -812,9 +758,6 @@ class Decoders {
         }
 
 
-        // Decoder for [MapTest]
-            return Decoders.decode(clazz: [MapTest].self, source: source, instance: instance)
-        }
         // Decoder for MapTest
         Decoders.addDecoder(clazz: MapTest.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<MapTest> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -838,9 +781,6 @@ class Decoders {
         }
 
 
-        // Decoder for [MixedPropertiesAndAdditionalPropertiesClass]
-            return Decoders.decode(clazz: [MixedPropertiesAndAdditionalPropertiesClass].self, source: source, instance: instance)
-        }
         // Decoder for MixedPropertiesAndAdditionalPropertiesClass
         Decoders.addDecoder(clazz: MixedPropertiesAndAdditionalPropertiesClass.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<MixedPropertiesAndAdditionalPropertiesClass> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -870,9 +810,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Model200Response]
-            return Decoders.decode(clazz: [Model200Response].self, source: source, instance: instance)
-        }
         // Decoder for Model200Response
         Decoders.addDecoder(clazz: Model200Response.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Model200Response> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -896,9 +833,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Name]
-            return Decoders.decode(clazz: [Name].self, source: source, instance: instance)
-        }
         // Decoder for Name
         Decoders.addDecoder(clazz: Name.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Name> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -934,9 +868,6 @@ class Decoders {
         }
 
 
-        // Decoder for [NumberOnly]
-            return Decoders.decode(clazz: [NumberOnly].self, source: source, instance: instance)
-        }
         // Decoder for NumberOnly
         Decoders.addDecoder(clazz: NumberOnly.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<NumberOnly> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -954,9 +885,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Order]
-            return Decoders.decode(clazz: [Order].self, source: source, instance: instance)
-        }
         // Decoder for Order
         Decoders.addDecoder(clazz: Order.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Order> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -1004,9 +932,6 @@ class Decoders {
         }
 
 
-        // Decoder for [OuterEnum]
-            return Decoders.decode(clazz: [OuterEnum].self, source: source, instance: instance)
-        }
         // Decoder for OuterEnum
         Decoders.addDecoder(clazz: OuterEnum.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<OuterEnum> in
             //TODO: I don't think we need this anymore
@@ -1014,9 +939,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Pet]
-            return Decoders.decode(clazz: [Pet].self, source: source, instance: instance)
-        }
         // Decoder for Pet
         Decoders.addDecoder(clazz: Pet.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Pet> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -1064,9 +986,6 @@ class Decoders {
         }
 
 
-        // Decoder for [ReadOnlyFirst]
-            return Decoders.decode(clazz: [ReadOnlyFirst].self, source: source, instance: instance)
-        }
         // Decoder for ReadOnlyFirst
         Decoders.addDecoder(clazz: ReadOnlyFirst.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<ReadOnlyFirst> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -1090,9 +1009,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Return]
-            return Decoders.decode(clazz: [Return].self, source: source, instance: instance)
-        }
         // Decoder for Return
         Decoders.addDecoder(clazz: Return.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Return> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -1110,9 +1026,6 @@ class Decoders {
         }
 
 
-        // Decoder for [SpecialModelName]
-            return Decoders.decode(clazz: [SpecialModelName].self, source: source, instance: instance)
-        }
         // Decoder for SpecialModelName
         Decoders.addDecoder(clazz: SpecialModelName.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<SpecialModelName> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -1130,9 +1043,6 @@ class Decoders {
         }
 
 
-        // Decoder for [Tag]
-            return Decoders.decode(clazz: [Tag].self, source: source, instance: instance)
-        }
         // Decoder for Tag
         Decoders.addDecoder(clazz: Tag.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<Tag> in
             if let sourceDictionary = source as? [AnyHashable: Any] {
@@ -1156,9 +1066,6 @@ class Decoders {
         }
 
 
-        // Decoder for [User]
-            return Decoders.decode(clazz: [User].self, source: source, instance: instance)
-        }
         // Decoder for User
         Decoders.addDecoder(clazz: User.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<User> in
             if let sourceDictionary = source as? [AnyHashable: Any] {