diff --git a/tools/Az.Tools.Predictor/Az.Tools.Predictor/Commands/DisableAzPredictor.cs b/tools/Az.Tools.Predictor/Az.Tools.Predictor/Commands/DisableAzPredictor.cs
index d99005a21e20..72a230ae46cc 100644
--- a/tools/Az.Tools.Predictor/Az.Tools.Predictor/Commands/DisableAzPredictor.cs
+++ b/tools/Az.Tools.Predictor/Az.Tools.Predictor/Commands/DisableAzPredictor.cs
@@ -12,7 +12,6 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using System;
 using System.Text;
 using System.Management.Automation;
 
@@ -29,11 +28,10 @@ public sealed class DisableAzPredictor : PSCmdlet
         };
 
         /// <summary>
-        /// Gets and sets the session that this cmdlet applies to.
+        /// Indicates whether it's applied to all sessions.
         /// </summary>
-        [Parameter(Position = 0)]
-        [ValidateSet(nameof(SessionParameterValue.All), nameof(SessionParameterValue.Current))]
-        public SessionParameterValue Session { get; set; }
+        [Parameter(Mandatory = false)]
+        public SwitchParameter AllSession { get; set; }
 
         /// <summary>
         /// Indicates whether the user would like to receive output.
@@ -47,7 +45,7 @@ protected override void ProcessRecord()
             var scriptToRun = new StringBuilder();
             var _ = scriptToRun.Append(DisableAzPredictor._DisableStatements[0]);
 
-            if (Session == SessionParameterValue.All)
+            if (AllSession.IsPresent)
             {
                 _ = scriptToRun.Append(";Write-Host \"To disable Az Predictor, please edit your profile ($PROFILE) and remove the following lines:`nImport-Module Az.Tools.Predictor`nSet-PSReadLineOption -PredictionSource HistoryAndPlugin`n\"");
             }
diff --git a/tools/Az.Tools.Predictor/Az.Tools.Predictor/Commands/EnableAzPredictor.cs b/tools/Az.Tools.Predictor/Az.Tools.Predictor/Commands/EnableAzPredictor.cs
index 607ef36bef63..b01c70734e7b 100644
--- a/tools/Az.Tools.Predictor/Az.Tools.Predictor/Commands/EnableAzPredictor.cs
+++ b/tools/Az.Tools.Predictor/Az.Tools.Predictor/Commands/EnableAzPredictor.cs
@@ -12,7 +12,6 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using System;
 using System.Text;
 using System.Management.Automation;
 
@@ -30,11 +29,10 @@ public sealed class EnableAzPredictor : PSCmdlet
         };
 
         /// <summary>
-        /// Gets and sets the session that this cmdlet applies to.
+        /// Indicates whether it's applied to all sessions.
         /// </summary>
-        [Parameter(Position = 0)]
-        [ValidateSet(nameof(SessionParameterValue.All), nameof(SessionParameterValue.Current))]
-        public SessionParameterValue Session { get; set; }
+        [Parameter(Mandatory = false)]
+        public SwitchParameter AllSession { get; set; }
 
         /// <summary>
         /// Indicates whether the user would like to receive output.
@@ -48,7 +46,7 @@ protected override void ProcessRecord()
             var scriptToRun = new StringBuilder();
             var _ = scriptToRun.Append(EnableAzPredictor._EnableStatements[1]);
 
-            if (Session == SessionParameterValue.All)
+            if (AllSession.IsPresent)
             {
                 _ = scriptToRun.Append($";Add-Content -Path $PROFILE -Value \"`n{string.Join("`n", EnableAzPredictor._EnableStatements)}\" -NoNewline -Encoding UTF8 -Force")
                                 .Append($";Write-Host \"User profile ($PROFILE) has been updated.`n\"");
diff --git a/tools/Az.Tools.Predictor/Az.Tools.Predictor/Commands/SessionParameterValue.cs b/tools/Az.Tools.Predictor/Az.Tools.Predictor/Commands/SessionParameterValue.cs
deleted file mode 100644
index 431899cfeb35..000000000000
--- a/tools/Az.Tools.Predictor/Az.Tools.Predictor/Commands/SessionParameterValue.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// ----------------------------------------------------------------------------------
-//
-// Copyright Microsoft Corporation
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// ----------------------------------------------------------------------------------
-
-namespace Microsoft.Azure.PowerShell.Tools.AzPredictor
-{
-    /// <summary>
-    /// The value used in the parameter -Session in the cmdlets.
-    /// </summary>
-    public enum SessionParameterValue
-    {
-        /// <value>
-        /// All the session.
-        /// </value>
-        All,
-
-        /// <value>
-        /// The current session.
-        /// </value>
-        Current
-    }
-}