diff --git a/samples/client/petstore/typescript/builds/default/models/Cat.ts b/samples/client/petstore/typescript/builds/default/models/Cat.ts
deleted file mode 100644
index 7474d1a8ad6..00000000000
--- a/samples/client/petstore/typescript/builds/default/models/Cat.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-	TODO: LICENSE INFO
-*/
-import { Pet2 } from './Pet2';
-
-/**
-* A representation of a cat
-*/
-export class Cat extends Pet2 {
-    /**
-    * The measured skill for hunting
-    */
-    'huntingSkill': CatHuntingSkillEnum;
-
-    static readonly discriminator: string | undefined = undefined;
-
-    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string}> = [
-        {
-            "name": "huntingSkill",
-            "baseName": "huntingSkill",
-            "type": "CatHuntingSkillEnum"
-        }    ];
-
-    static getAttributeTypeMap() {
-        return super.getAttributeTypeMap().concat(Cat.attributeTypeMap);
-    }
-    
-    public constructor() {
-        super();
-        this.petType = "Cat";
-    }
-}
-
-
-export type CatHuntingSkillEnum = "clueless" | "lazy" | "adventurous" | "aggressive" ;
-
diff --git a/samples/client/petstore/typescript/builds/default/models/Dog.ts b/samples/client/petstore/typescript/builds/default/models/Dog.ts
deleted file mode 100644
index 27db6214430..00000000000
--- a/samples/client/petstore/typescript/builds/default/models/Dog.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-	TODO: LICENSE INFO
-*/
-import { Pet2 } from './Pet2';
-
-/**
-* A representation of a dog
-*/
-export class Dog extends Pet2 {
-    /**
-    * the size of the pack the dog is from
-    */
-    'packSize': number;
-
-    static readonly discriminator: string | undefined = undefined;
-
-    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string}> = [
-        {
-            "name": "packSize",
-            "baseName": "packSize",
-            "type": "number"
-        }    ];
-
-    static getAttributeTypeMap() {
-        return super.getAttributeTypeMap().concat(Dog.attributeTypeMap);
-    }
-    
-    public constructor() {
-        super();
-        this.petType = "Dog";
-    }
-}
-
diff --git a/samples/client/petstore/typescript/builds/default/models/ErrorModel.ts b/samples/client/petstore/typescript/builds/default/models/ErrorModel.ts
deleted file mode 100644
index 9dc7a6e1ae4..00000000000
--- a/samples/client/petstore/typescript/builds/default/models/ErrorModel.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-	TODO: LICENSE INFO
-*/
-
-export class ErrorModel {
-    'message': string;
-    'code': number;
-
-    static readonly discriminator: string | undefined = undefined;
-
-    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string}> = [
-        {
-            "name": "message",
-            "baseName": "message",
-            "type": "string"
-        },
-        {
-            "name": "code",
-            "baseName": "code",
-            "type": "number"
-        }    ];
-
-    static getAttributeTypeMap() {
-        return ErrorModel.attributeTypeMap;
-    }
-    
-    public constructor() {
-    }
-}
-
diff --git a/samples/client/petstore/typescript/builds/default/models/ExtendedErrorModel.ts b/samples/client/petstore/typescript/builds/default/models/ExtendedErrorModel.ts
deleted file mode 100644
index cf0b46b68f1..00000000000
--- a/samples/client/petstore/typescript/builds/default/models/ExtendedErrorModel.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-	TODO: LICENSE INFO
-*/
-import { ErrorModel } from './ErrorModel';
-
-export class ExtendedErrorModel extends ErrorModel {
-    'rootCause': string;
-
-    static readonly discriminator: string | undefined = undefined;
-
-    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string}> = [
-        {
-            "name": "rootCause",
-            "baseName": "rootCause",
-            "type": "string"
-        }    ];
-
-    static getAttributeTypeMap() {
-        return super.getAttributeTypeMap().concat(ExtendedErrorModel.attributeTypeMap);
-    }
-    
-    public constructor() {
-        super();
-    }
-}
-
diff --git a/samples/client/petstore/typescript/builds/default/models/ObjectSerializer.ts b/samples/client/petstore/typescript/builds/default/models/ObjectSerializer.ts
index b5bac247746..6e0c08a9baf 100644
--- a/samples/client/petstore/typescript/builds/default/models/ObjectSerializer.ts
+++ b/samples/client/petstore/typescript/builds/default/models/ObjectSerializer.ts
@@ -1,24 +1,14 @@
 export * from './ApiResponse';
-export * from './Cat';
 export * from './Category';
-export * from './Dog';
-export * from './ErrorModel';
-export * from './ExtendedErrorModel';
 export * from './Order';
 export * from './Pet';
-export * from './Pet2';
 export * from './Tag';
 export * from './User';
 
 import { ApiResponse } from './ApiResponse';
-import { Cat, CatHuntingSkillEnum   } from './Cat';
 import { Category } from './Category';
-import { Dog } from './Dog';
-import { ErrorModel } from './ErrorModel';
-import { ExtendedErrorModel } from './ExtendedErrorModel';
 import { Order    , OrderStatusEnum    } from './Order';
 import { Pet     , PetStatusEnum   } from './Pet';
-import { Pet2 } from './Pet2';
 import { Tag } from './Tag';
 import { User } from './User';
 
@@ -35,21 +25,15 @@ let primitives = [
                  ];
                  
 let enumsMap: Set<string> = new Set<string>([
-					"CatHuntingSkillEnum",
 					"OrderStatusEnum",
 					"PetStatusEnum",
 ]);
 
 let typeMap: {[index: string]: any} = {
     "ApiResponse": ApiResponse,
-    "Cat": Cat,
     "Category": Category,
-    "Dog": Dog,
-    "ErrorModel": ErrorModel,
-    "ExtendedErrorModel": ExtendedErrorModel,
     "Order": Order,
     "Pet": Pet,
-    "Pet2": Pet2,
     "Tag": Tag,
     "User": User,
 }
diff --git a/samples/client/petstore/typescript/builds/default/models/Pet2.ts b/samples/client/petstore/typescript/builds/default/models/Pet2.ts
deleted file mode 100644
index 865be4493a5..00000000000
--- a/samples/client/petstore/typescript/builds/default/models/Pet2.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-	TODO: LICENSE INFO
-*/
-
-export class Pet2 {
-    'name': string;
-    'petType': string;
-
-    static readonly discriminator: string | undefined = "petType";
-
-    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string}> = [
-        {
-            "name": "name",
-            "baseName": "name",
-            "type": "string"
-        },
-        {
-            "name": "petType",
-            "baseName": "petType",
-            "type": "string"
-        }    ];
-
-    static getAttributeTypeMap() {
-        return Pet2.attributeTypeMap;
-    }
-    
-    public constructor() {
-        this.petType = "Pet2";
-    }
-}
-
diff --git a/samples/client/petstore/typescript/builds/default/models/all.ts b/samples/client/petstore/typescript/builds/default/models/all.ts
index 5b69a96a602..2edba7f0bd5 100644
--- a/samples/client/petstore/typescript/builds/default/models/all.ts
+++ b/samples/client/petstore/typescript/builds/default/models/all.ts
@@ -1,11 +1,6 @@
 export * from './ApiResponse'
-export * from './Cat'
 export * from './Category'
-export * from './Dog'
-export * from './ErrorModel'
-export * from './ExtendedErrorModel'
 export * from './Order'
 export * from './Pet'
-export * from './Pet2'
 export * from './Tag'
 export * from './User'
diff --git a/samples/client/petstore/typescript/builds/default/types/ObservableAPI.ts b/samples/client/petstore/typescript/builds/default/types/ObservableAPI.ts
index 30171cf9f08..8499e8bacad 100644
--- a/samples/client/petstore/typescript/builds/default/types/ObservableAPI.ts
+++ b/samples/client/petstore/typescript/builds/default/types/ObservableAPI.ts
@@ -5,14 +5,9 @@ import { Observable, of } from 'rxjs';
 import {mergeMap, map} from  'rxjs/operators';
 
 import { ApiResponse } from '../models/ApiResponse';
-import { Cat } from '../models/Cat';
 import { Category } from '../models/Category';
-import { Dog } from '../models/Dog';
-import { ErrorModel } from '../models/ErrorModel';
-import { ExtendedErrorModel } from '../models/ExtendedErrorModel';
 import { Order } from '../models/Order';
 import { Pet } from '../models/Pet';
-import { Pet2 } from '../models/Pet2';
 import { Tag } from '../models/Tag';
 import { User } from '../models/User';
 
diff --git a/samples/client/petstore/typescript/builds/default/types/PromiseAPI.ts b/samples/client/petstore/typescript/builds/default/types/PromiseAPI.ts
index f2d947179b9..c449b9e5b8e 100644
--- a/samples/client/petstore/typescript/builds/default/types/PromiseAPI.ts
+++ b/samples/client/petstore/typescript/builds/default/types/PromiseAPI.ts
@@ -3,14 +3,9 @@ import * as models from '../models/all';
 import { Configuration} from '../configuration'
 
 import { ApiResponse } from '../models/ApiResponse';
-import { Cat } from '../models/Cat';
 import { Category } from '../models/Category';
-import { Dog } from '../models/Dog';
-import { ErrorModel } from '../models/ErrorModel';
-import { ExtendedErrorModel } from '../models/ExtendedErrorModel';
 import { Order } from '../models/Order';
 import { Pet } from '../models/Pet';
-import { Pet2 } from '../models/Pet2';
 import { Tag } from '../models/Tag';
 import { User } from '../models/User';
 import { ObservablePetApi } from './ObservableAPI';