3 files changed, 1 insertions, 13 deletions
diff --git a/ShellPkg/Application/Shell/Shell.c b/ShellPkg/Application/Shell/Shell.c
index 9bacf9d..483fe4d 100644
--- a/ShellPkg/Application/Shell/Shell.c
+++ b/ShellPkg/Application/Shell/Shell.c
@@ -395,11 +395,7 @@ UefiMain (
   //
   // Check PCDs for optional features that are not implemented yet.
   //
-  if (  PcdGetBool (PcdShellSupportOldProtocols)
-     || !FeaturePcdGet (PcdShellRequireHiiPlatform)
-     || FeaturePcdGet (PcdShellSupportFrameworkHii)
-        )
-  {
+  if (!FeaturePcdGet (PcdShellRequireHiiPlatform) || FeaturePcdGet (PcdShellSupportFrameworkHii)) {
     return (EFI_UNSUPPORTED);
   }
 
diff --git a/ShellPkg/Application/Shell/Shell.inf b/ShellPkg/Application/Shell/Shell.inf
index f1e41de..5a7492c 100644
--- a/ShellPkg/Application/Shell/Shell.inf
+++ b/ShellPkg/Application/Shell/Shell.inf
@@ -93,7 +93,6 @@
 
 [Pcd]
   gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel           ## CONSUMES
-  gEfiShellPkgTokenSpaceGuid.PcdShellSupportOldProtocols    ## CONSUMES
   gEfiShellPkgTokenSpaceGuid.PcdShellRequireHiiPlatform     ## CONSUMES
   gEfiShellPkgTokenSpaceGuid.PcdShellSupportFrameworkHii    ## CONSUMES
   gEfiShellPkgTokenSpaceGuid.PcdShellPageBreakDefault       ## CONSUMES
diff --git a/ShellPkg/Application/Shell/ShellProtocol.c b/ShellPkg/Application/Shell/ShellProtocol.c
index ff53f6b..3bc6239 100644
--- a/ShellPkg/Application/Shell/ShellProtocol.c
+++ b/ShellPkg/Application/Shell/ShellProtocol.c
@@ -1624,8 +1624,6 @@ InternalShellExecuteDevicePath (
     Status = gBS->InstallProtocolInterface (&NewHandle, &gEfiShellParametersProtocolGuid, EFI_NATIVE_INTERFACE, &ShellParamsProtocol);
     ASSERT_EFI_ERROR (Status);
 
-    /// @todo initialize and install ShellInterface protocol on the new image for compatibility if - PcdGetBool(PcdShellSupportOldProtocols)
-
     //
     // now start the image and if the caller wanted the return code pass it to them...
     //
@@ -3889,11 +3887,6 @@ CreatePopulateInstallShellProtocol (
                     );
   }
 
-  if (PcdGetBool (PcdShellSupportOldProtocols)) {
-    /// @todo support ShellEnvironment2
-    /// @todo do we need to support ShellEnvironment (not ShellEnvironment2) also?
-  }
-
   if (!EFI_ERROR (Status)) {
     *NewShell = &mShellProtocol;
   }