PowerShell
diff --git a/‎src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs‎
Lines changed: 1 addition & 46 deletions b/‎src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs‎
Lines changed: 1 addition & 46 deletions
diff --git a/‎src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs‎
Lines changed: 0 additions & 5 deletions b/‎src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs‎
Lines changed: 0 additions & 5 deletions
@@ -2568,14 +2568,7 @@ internal void Run(bool inputLoopIsNested)
                                 // Evaluate any suggestions
                                 if (previousResponseWasEmpty == false)
                                 {
-                                    if (ExperimentalFeature.IsEnabled(ExperimentalFeature.PSFeedbackProvider))
-                                    {
-                                        EvaluateFeedbacks(ui);
-                                    }
-                                    else
-                                    {
-                                        EvaluateSuggestions(ui);
-                                    }
+                                    EvaluateFeedbacks(ui);
                                 }
 
                                 // Then output the prompt
@@ -2899,44 +2892,6 @@ private void EvaluateFeedbacks(ConsoleHostUserInterface ui)
                 }
             }
 
-            private void EvaluateSuggestions(ConsoleHostUserInterface ui)
-            {
-                // Output any training suggestions
-                try
-                {
-                    List<string> suggestions = HostUtilities.GetSuggestion(_parent.Runspace);
-
-                    if (suggestions.Count > 0)
-                    {
-                        ui.WriteLine();
-                    }
-
-                    bool first = true;
-                    foreach (string suggestion in suggestions)
-                    {
-                        if (!first)
-                            ui.WriteLine();
-
-                        ui.WriteLine(suggestion);
-
-                        first = false;
-                    }
-                }
-                catch (TerminateException)
-                {
-                    // A variable breakpoint may be hit by HostUtilities.GetSuggestion. The debugger throws TerminateExceptions to stop the execution
-                    // of the current statement; we do not want to treat these exceptions as errors.
-                }
-                catch (Exception e)
-                {
-                    // Catch-all OK. This is a third-party call-out.
-                    ui.WriteErrorLine(e.Message);
-
-                    LocalRunspace localRunspace = (LocalRunspace)_parent.Runspace;
-                    localRunspace.GetExecutionContext.AppendDollarError(e);
-                }
-            }
-
             private string EvaluatePrompt()
             {
                 string promptString = _promptExec.ExecuteCommandAndGetResultAsString("prompt", out _);
 
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
@@ -21,7 +20,6 @@ public class ExperimentalFeature
         #region Const Members
 
         internal const string EngineSource = "PSEngine";
-        internal const string PSFeedbackProvider = "PSFeedbackProvider";
         internal const string PSSerializeJSONLongEnumAsNumber = nameof(PSSerializeJSONLongEnumAsNumber);
 
         #endregion
@@ -108,9 +106,6 @@ static ExperimentalFeature()
                 new ExperimentalFeature(
                     name: "PSLoadAssemblyFromNativeCode",
                     description: "Expose an API to allow assembly loading from native code"),
-                new ExperimentalFeature(
-                    name: PSFeedbackProvider,
-                    description: "Replace the hard-coded suggestion framework with the extensible feedback provider"),
                 new ExperimentalFeature(
                     name: PSSerializeJSONLongEnumAsNumber,
                     description: "Serialize enums based on long or ulong as an numeric value rather than the string representation when using ConvertTo-Json."