diff --git a/PSSwagger/GeneratedHelpers.ps1 b/PSSwagger/GeneratedHelpers.ps1
deleted file mode 100644
index ca5fc69..0000000
--- a/PSSwagger/GeneratedHelpers.ps1
+++ /dev/null
@@ -1,20 +0,0 @@
-Microsoft.PowerShell.Core\Set-StrictMode -Version Latest
-
-<#
-.DESCRIPTION
-   Creates a System.Net.Http.HttpClientHandler for the given credentials and sets preauthentication to true.
-#>
-function New-HttpClientHandler {
-    [CmdletBinding()]
-    param(
-        [Parameter(Mandatory=$true)]
-        [PSCredential]
-        $Credential
-    )
-
-    Add-Type -AssemblyName System.Net.Http
-    $httpClientHandler = New-Object -TypeName System.Net.Http.HttpClientHandler
-    $httpClientHandler.PreAuthenticate = $true
-    $httpClientHandler.Credentials = $Credential
-    $httpClientHandler
-}
\ No newline at end of file
diff --git a/PSSwagger/New-ServiceClient.ps1 b/PSSwagger/New-ServiceClient.ps1
index 2c84f18..0bfad60 100644
--- a/PSSwagger/New-ServiceClient.ps1
+++ b/PSSwagger/New-ServiceClient.ps1
@@ -68,7 +68,12 @@ function New-ServiceClient {
     $ClientArgumentList += Invoke-Command @InvokeCommand_parameters
 
     if ($AddHttpClientHandler) {
-        $httpClientHandler = New-HttpClientHandler -Credential $Credential
+        if(-not ('System.Net.Http.HttpClientHandler' -as [Type])) {
+            Add-Type -AssemblyName System.Net.Http
+        }
+        $httpClientHandler = New-Object -TypeName System.Net.Http.HttpClientHandler
+        $httpClientHandler.PreAuthenticate = $true
+        $httpClientHandler.Credentials = $Credential
         $ClientArgumentList += $httpClientHandler
     }
     
diff --git a/PSSwagger/PSSwagger.Constants.ps1 b/PSSwagger/PSSwagger.Constants.ps1
index 6b84c48..fe6be5a 100644
--- a/PSSwagger/PSSwagger.Constants.ps1
+++ b/PSSwagger/PSSwagger.Constants.ps1
@@ -59,7 +59,6 @@ if (Test-Path -Path `$ClrPath -PathType Container) {
 }
 
 . (Join-Path -Path `$PSScriptRoot -ChildPath 'New-ServiceClient.ps1')
-. (Join-Path -Path `$PSScriptRoot -ChildPath 'GeneratedHelpers.ps1')
 
 `$allPs1FilesPath = Join-Path -Path `$PSScriptRoot -ChildPath '$GeneratedCommandsName' | Join-Path -ChildPath '*.ps1'
 Get-ChildItem -Path `$allPs1FilesPath -Recurse -File | ForEach-Object { . `$_.FullName}
diff --git a/PSSwagger/PSSwagger.psm1 b/PSSwagger/PSSwagger.psm1
index 36a3fff..0595470 100644
--- a/PSSwagger/PSSwagger.psm1
+++ b/PSSwagger/PSSwagger.psm1
@@ -618,10 +618,7 @@ function New-PSSwaggerModule
         -Info $swaggerDict['info'] `
         -PSHeaderComment $PSHeaderComment
 
-    $CopyFilesMap = [ordered]@{
-        'GeneratedHelpers.ps1'      = 'GeneratedHelpers.ps1'
-    }
-    
+    $CopyFilesMap = [ordered]@{}
     if($UseAzureCsharpGenerator) {
         $CopyFilesMap['New-ArmServiceClient.ps1'] = 'New-ServiceClient.ps1'
         $CopyFilesMap['Test-FullRequirements.ps1'] = 'Test-FullRequirements.ps1'