diff --git a/src/types/index.d.ts b/src/types/index.d.ts
index 196e5c85f..9e9ed5c38 100644
--- a/src/types/index.d.ts
+++ b/src/types/index.d.ts
@@ -14,4 +14,4 @@ import Client from './generated-client';
 
 export {
   Client,
-}
\ No newline at end of file
+}
diff --git a/src/types/resource.d.ts b/src/types/resource.d.ts
index 2a0ccd9a2..2d1c5d2fc 100644
--- a/src/types/resource.d.ts
+++ b/src/types/resource.d.ts
@@ -1,4 +1,3 @@
-export = Resource;
 /*!
  * Copyright (c) 2017-2021, Okta, Inc. and/or its affiliates. All rights reserved.
  * The Okta software accompanied by this notice is provided pursuant to the Apache License, Version 2.0 (the "License.")
@@ -14,3 +13,5 @@ export = Resource;
 declare class Resource {
     constructor(resourceJson: any, client: any);
 }
+
+export default Resource;
diff --git a/templates/generated-client.d.ts.hbs b/templates/generated-client.d.ts.hbs
index 27a6c8dc2..50694e2fc 100644
--- a/templates/generated-client.d.ts.hbs
+++ b/templates/generated-client.d.ts.hbs
@@ -1,5 +1,5 @@
 /*!
- * Copyright (c) 2017-2020, Okta, Inc. and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017-2021, Okta, Inc. and/or its affiliates. All rights reserved.
  * The Okta software accompanied by this notice is provided pursuant to the Apache License, Version 2.0 (the "License.")
  *
  * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
@@ -18,4 +18,4 @@ declare class GeneratedApiClient {
 {{/each}}
 }
 
-export = GeneratedApiClient;
+export default GeneratedApiClient;
diff --git a/templates/helpers/model.js b/templates/helpers/model.js
deleted file mode 100644
index e69de29bb..000000000
diff --git a/templates/index.js b/templates/index.js
index 824c5c8c2..7e807384c 100644
--- a/templates/index.js
+++ b/templates/index.js
@@ -90,15 +90,6 @@ js.process = ({spec, operations, models, handlebars}) => {
           propertyName: model.resolutionStrategy.propertyName
         }
       });
-      templates.push({
-        src: 'factory.d.ts.hbs',
-        dest: `src/types/factories/${model.modelName}Factory.d.ts`,
-        context: {
-          parentModelName: model.modelName,
-          mapping,
-          propertyName: model.resolutionStrategy.propertyName
-        }
-      });
     }
   }
 
@@ -120,12 +111,6 @@ js.process = ({spec, operations, models, handlebars}) => {
     context: { models: models.filter(model => model.requiresResolution) }
   });
 
-  templates.push({
-    src: 'factories.index.d.ts.hbs',
-    dest: 'src/types/factories/index.d.ts',
-    context: { models: models.filter(model => model.requiresResolution) }
-  });
-
   // Add helpers
 
   // Register Operation helpers