diff --git a/src/code/InstallHelper.cs b/src/code/InstallHelper.cs
index 1679c06fa..87d624e9d 100644
--- a/src/code/InstallHelper.cs
+++ b/src/code/InstallHelper.cs
@@ -46,11 +46,14 @@ internal class InstallHelper : PSCmdlet
         bool _asNupkg;
         bool _includeXML;
 
-        public InstallHelper(bool updatePkg, bool savePkg, CancellationToken cancellationToken, PSCmdlet cmdletPassedIn)
+        public InstallHelper(bool updatePkg, bool savePkg, PSCmdlet cmdletPassedIn)
         {
+            // Define the cancellation token.
+            CancellationTokenSource source = new CancellationTokenSource();
+            _cancellationToken = source.Token;
+            
             this._updatePkg = updatePkg;
             this._savePkg = savePkg;
-            this._cancellationToken = cancellationToken;
             this._cmdletPassedIn = cmdletPassedIn;
         }
 
diff --git a/src/code/InstallPSResource.cs b/src/code/InstallPSResource.cs
index 62e07785e..51a7a3fc8 100644
--- a/src/code/InstallPSResource.cs
+++ b/src/code/InstallPSResource.cs
@@ -59,7 +59,6 @@ class InstallPSResource : PSCmdlet
         /// <summary>
         /// Specifies the scope of installation.
         /// </summary>
-        [ValidateSet("CurrentUser", "AllUsers")]
         [Parameter(ParameterSetName = NameParameterSet)]
         public ScopeType Scope { get; set; }
 
@@ -125,11 +124,7 @@ protected override void BeginProcessing()
 
         protected override void ProcessRecord()
         {
-            // Define the cancellation token.
-            CancellationTokenSource source = new CancellationTokenSource();
-            CancellationToken cancellationToken = source.Token;
-
-            var installHelper = new InstallHelper(updatePkg: false, savePkg: false, cancellationToken: cancellationToken, cmdletPassedIn: this);
+            var installHelper = new InstallHelper(updatePkg: false, savePkg: false, cmdletPassedIn: this);
 
             switch (ParameterSetName)
             {
diff --git a/src/code/SavePSResource.cs b/src/code/SavePSResource.cs
index ef89b431f..a68496dd6 100644
--- a/src/code/SavePSResource.cs
+++ b/src/code/SavePSResource.cs
@@ -146,11 +146,7 @@ protected override void BeginProcessing()
 
         protected override void ProcessRecord()
         {
-            // Define the cancellation token.
-            CancellationTokenSource source = new CancellationTokenSource();
-            CancellationToken cancellationToken = source.Token;
-
-            var installHelper = new InstallHelper(updatePkg: false, savePkg: true, cancellationToken: cancellationToken, cmdletPassedIn: this);
+            var installHelper = new InstallHelper(updatePkg: false, savePkg: true, cmdletPassedIn: this);
 
             switch (ParameterSetName)
             {