diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNancyFXServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNancyFXServerCodegen.java
index e260a6cdbde..93c2d0d2136 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNancyFXServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNancyFXServerCodegen.java
@@ -118,8 +118,6 @@ public class CSharpNancyFXServerCodegen extends AbstractCSharpCodegen {
         addSwitch(ASYNC_SERVER, "Set to true to enable the generation of async routes/endpoints.", this.asyncServer);
         typeMapping.putAll(nodaTimeTypesMappings());
         languageSpecificPrimitives.addAll(nodaTimePrimitiveTypes());
-
-        importMapping.clear();
     }
 
     @Override
diff --git a/modules/openapi-generator/src/main/resources/csharp-nancyfx/api.mustache b/modules/openapi-generator/src/main/resources/csharp-nancyfx/api.mustache
index ea7b5aa2b74..02538ba251c 100644
--- a/modules/openapi-generator/src/main/resources/csharp-nancyfx/api.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-nancyfx/api.mustache
@@ -7,8 +7,6 @@ using {{packageName}}.{{packageContext}}.Models;
 using {{packageName}}.{{packageContext}}.Utils;
 using NodaTime;{{#asyncServer}}
 using System.Threading.Tasks;{{/asyncServer}}
-{{#imports}}using {{import}};
-{{/imports}}
 
 namespace {{packageName}}.{{packageContext}}.Modules
 { {{#operations}}{{#operation}}{{#allParams}}{{#isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/csharp-nancyfx/model.mustache b/modules/openapi-generator/src/main/resources/csharp-nancyfx/model.mustache
index 090f503b42c..7765632abdb 100644
--- a/modules/openapi-generator/src/main/resources/csharp-nancyfx/model.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-nancyfx/model.mustache
@@ -4,8 +4,6 @@ using System.IO;
 using System.Text;
 using Sharpility.Extensions;
 using NodaTime;
-{{#imports}}using {{import}};
-{{/imports}}
 
 namespace {{packageName}}.{{packageContext}}.Models
 {
@@ -14,4 +12,4 @@ namespace {{packageName}}.{{packageContext}}.Models
 {{#isEnum}}{{>modelEnum}}{{/isEnum}}{{^isEnum}}{{>modelGeneric}}{{/isEnum}}
 {{/model}}
 {{/models}}
-}
\ No newline at end of file
+}
diff --git a/samples/server/petstore/nancyfx-async/IO.Swagger.sln b/samples/server/petstore/nancyfx-async/IO.Swagger.sln
deleted file mode 100644
index 1e40deb1a14..00000000000
--- a/samples/server/petstore/nancyfx-async/IO.Swagger.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-VisualStudioVersion = 12.0.0.0
-MinimumVisualStudioVersion = 10.0.0.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{768B8DC6-54EE-4D40-9B20-7857E1D742A4}"
-EndProject
-Global
-GlobalSection(SolutionConfigurationPlatforms) = preSolution
-Debug|Any CPU = Debug|Any CPU
-Release|Any CPU = Release|Any CPU
-EndGlobalSection
-GlobalSection(ProjectConfigurationPlatforms) = postSolution
-{768B8DC6-54EE-4D40-9B20-7857E1D742A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-{768B8DC6-54EE-4D40-9B20-7857E1D742A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-{768B8DC6-54EE-4D40-9B20-7857E1D742A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-{768B8DC6-54EE-4D40-9B20-7857E1D742A4}.Release|Any CPU.Build.0 = Release|Any CPU
-{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU
-{19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU
-{19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.Build.0 = Release|Any CPU
-EndGlobalSection
-GlobalSection(SolutionProperties) = preSolution
-HideSolutionNode = FALSE
-EndGlobalSection
-EndGlobal
\ No newline at end of file
diff --git a/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Models/ApiResponse.cs b/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Models/ApiResponse.cs
index b10ee576573..2c35c0c5fd9 100644
--- a/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Models/ApiResponse.cs
+++ b/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Models/ApiResponse.cs
@@ -182,4 +182,4 @@ namespace Org.OpenAPITools._v2.Models
 
         
     }
-}
\ No newline at end of file
+}
diff --git a/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Models/Category.cs b/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Models/Category.cs
index 23f20131922..3cadeec39fe 100644
--- a/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Models/Category.cs
+++ b/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Models/Category.cs
@@ -162,4 +162,4 @@ namespace Org.OpenAPITools._v2.Models
 
         
     }
-}
\ No newline at end of file
+}
diff --git a/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Models/Order.cs b/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Models/Order.cs
index cc5625e044a..3ef8e9133c7 100644
--- a/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Models/Order.cs
+++ b/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Models/Order.cs
@@ -244,4 +244,4 @@ namespace Org.OpenAPITools._v2.Models
         
         public enum StatusEnum { Placed, Approved, Delivered };
     }
-}
\ No newline at end of file
+}
diff --git a/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Models/Pet.cs b/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Models/Pet.cs
index 7f33c53c908..a9e839bb969 100644
--- a/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Models/Pet.cs
+++ b/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Models/Pet.cs
@@ -251,4 +251,4 @@ namespace Org.OpenAPITools._v2.Models
         
         public enum StatusEnum { Available, Pending, Sold };
     }
-}
\ No newline at end of file
+}
diff --git a/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Models/Tag.cs b/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Models/Tag.cs
index 4fb84eef765..e46182c334c 100644
--- a/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Models/Tag.cs
+++ b/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Models/Tag.cs
@@ -162,4 +162,4 @@ namespace Org.OpenAPITools._v2.Models
 
         
     }
-}
\ No newline at end of file
+}
diff --git a/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Models/User.cs b/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Models/User.cs
index f4307685294..29c94bbfefe 100644
--- a/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Models/User.cs
+++ b/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Models/User.cs
@@ -282,4 +282,4 @@ namespace Org.OpenAPITools._v2.Models
 
         
     }
-}
\ No newline at end of file
+}
diff --git a/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Modules/PetModule.cs b/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Modules/PetModule.cs
index 69ebd56823b..28e385ce104 100644
--- a/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Modules/PetModule.cs
+++ b/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Modules/PetModule.cs
@@ -7,7 +7,6 @@ using Org.OpenAPITools._v2.Models;
 using Org.OpenAPITools._v2.Utils;
 using NodaTime;
 using System.Threading.Tasks;
-using ;
 
 namespace Org.OpenAPITools._v2.Modules
 { 
diff --git a/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Modules/StoreModule.cs b/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Modules/StoreModule.cs
index 5e11cce06ac..eed0645da35 100644
--- a/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Modules/StoreModule.cs
+++ b/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Modules/StoreModule.cs
@@ -7,7 +7,6 @@ using Org.OpenAPITools._v2.Models;
 using Org.OpenAPITools._v2.Utils;
 using NodaTime;
 using System.Threading.Tasks;
-using ;
 
 namespace Org.OpenAPITools._v2.Modules
 { 
diff --git a/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Modules/UserModule.cs b/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Modules/UserModule.cs
index 65f3c9396d6..23d99c214e4 100644
--- a/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Modules/UserModule.cs
+++ b/samples/server/petstore/nancyfx-async/src/Org.OpenAPITools/Modules/UserModule.cs
@@ -7,7 +7,6 @@ using Org.OpenAPITools._v2.Models;
 using Org.OpenAPITools._v2.Utils;
 using NodaTime;
 using System.Threading.Tasks;
-using ;
 
 namespace Org.OpenAPITools._v2.Modules
 { 
diff --git a/samples/server/petstore/nancyfx/IO.Swagger.sln b/samples/server/petstore/nancyfx/IO.Swagger.sln
deleted file mode 100644
index 1e40deb1a14..00000000000
--- a/samples/server/petstore/nancyfx/IO.Swagger.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-VisualStudioVersion = 12.0.0.0
-MinimumVisualStudioVersion = 10.0.0.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{768B8DC6-54EE-4D40-9B20-7857E1D742A4}"
-EndProject
-Global
-GlobalSection(SolutionConfigurationPlatforms) = preSolution
-Debug|Any CPU = Debug|Any CPU
-Release|Any CPU = Release|Any CPU
-EndGlobalSection
-GlobalSection(ProjectConfigurationPlatforms) = postSolution
-{768B8DC6-54EE-4D40-9B20-7857E1D742A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-{768B8DC6-54EE-4D40-9B20-7857E1D742A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-{768B8DC6-54EE-4D40-9B20-7857E1D742A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-{768B8DC6-54EE-4D40-9B20-7857E1D742A4}.Release|Any CPU.Build.0 = Release|Any CPU
-{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU
-{19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU
-{19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.Build.0 = Release|Any CPU
-EndGlobalSection
-GlobalSection(SolutionProperties) = preSolution
-HideSolutionNode = FALSE
-EndGlobalSection
-EndGlobal
\ No newline at end of file
diff --git a/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/ApiResponse.cs b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/ApiResponse.cs
index b10ee576573..2c35c0c5fd9 100644
--- a/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/ApiResponse.cs
+++ b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/ApiResponse.cs
@@ -182,4 +182,4 @@ namespace Org.OpenAPITools._v2.Models
 
         
     }
-}
\ No newline at end of file
+}
diff --git a/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/Category.cs b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/Category.cs
index 23f20131922..3cadeec39fe 100644
--- a/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/Category.cs
+++ b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/Category.cs
@@ -162,4 +162,4 @@ namespace Org.OpenAPITools._v2.Models
 
         
     }
-}
\ No newline at end of file
+}
diff --git a/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/Order.cs b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/Order.cs
index cc5625e044a..3ef8e9133c7 100644
--- a/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/Order.cs
+++ b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/Order.cs
@@ -244,4 +244,4 @@ namespace Org.OpenAPITools._v2.Models
         
         public enum StatusEnum { Placed, Approved, Delivered };
     }
-}
\ No newline at end of file
+}
diff --git a/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/Pet.cs b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/Pet.cs
index 7f33c53c908..a9e839bb969 100644
--- a/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/Pet.cs
+++ b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/Pet.cs
@@ -251,4 +251,4 @@ namespace Org.OpenAPITools._v2.Models
         
         public enum StatusEnum { Available, Pending, Sold };
     }
-}
\ No newline at end of file
+}
diff --git a/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/Tag.cs b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/Tag.cs
index 4fb84eef765..e46182c334c 100644
--- a/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/Tag.cs
+++ b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/Tag.cs
@@ -162,4 +162,4 @@ namespace Org.OpenAPITools._v2.Models
 
         
     }
-}
\ No newline at end of file
+}
diff --git a/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/User.cs b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/User.cs
index f4307685294..29c94bbfefe 100644
--- a/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/User.cs
+++ b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/User.cs
@@ -282,4 +282,4 @@ namespace Org.OpenAPITools._v2.Models
 
         
     }
-}
\ No newline at end of file
+}
diff --git a/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Modules/PetModule.cs b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Modules/PetModule.cs
index a4acc926ec9..12233957857 100644
--- a/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Modules/PetModule.cs
+++ b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Modules/PetModule.cs
@@ -6,7 +6,6 @@ using Sharpility.Base;
 using Org.OpenAPITools._v2.Models;
 using Org.OpenAPITools._v2.Utils;
 using NodaTime;
-using ;
 
 namespace Org.OpenAPITools._v2.Modules
 { 
diff --git a/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Modules/StoreModule.cs b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Modules/StoreModule.cs
index d35a39ccad3..0c75b02fd9a 100644
--- a/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Modules/StoreModule.cs
+++ b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Modules/StoreModule.cs
@@ -6,7 +6,6 @@ using Sharpility.Base;
 using Org.OpenAPITools._v2.Models;
 using Org.OpenAPITools._v2.Utils;
 using NodaTime;
-using ;
 
 namespace Org.OpenAPITools._v2.Modules
 { 
diff --git a/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Modules/UserModule.cs b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Modules/UserModule.cs
index e228272e724..cc268b9a2c5 100644
--- a/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Modules/UserModule.cs
+++ b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Modules/UserModule.cs
@@ -6,7 +6,6 @@ using Sharpility.Base;
 using Org.OpenAPITools._v2.Models;
 using Org.OpenAPITools._v2.Utils;
 using NodaTime;
-using ;
 
 namespace Org.OpenAPITools._v2.Modules
 {