diff --git a/EdkNt32Pkg/EdkNt32Pkg.spd b/EdkNt32Pkg/EdkNt32Pkg.spd
index 7371f22d01..ea207e3e44 100644
--- a/EdkNt32Pkg/EdkNt32Pkg.spd
+++ b/EdkNt32Pkg/EdkNt32Pkg.spd
@@ -367,50 +367,5 @@
       <DefaultValue>L"Bus Driver Console Window"</DefaultValue>
       <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdRothmanTest</C_Name>
-      <Token>0x0000100b</Token>
-      <TokenSpaceGuidCName>FIX_ME_PcdRothmanTest</TokenSpaceGuidCName>
-      <DatumType>UINT32</DatumType>
-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
-      <DefaultValue>0</DefaultValue>
-      <HelpText>HELP FIX ME!</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdWinNtBinaryPatch1</C_Name>
-      <Token>0x0001000b</Token>
-      <TokenSpaceGuidCName>FIX_ME_PcdWinNtBinaryPatch1</TokenSpaceGuidCName>
-      <DatumType>UINT32</DatumType>
-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
-      <DefaultValue>0x1234</DefaultValue>
-      <HelpText>HELP FIX ME!</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdWinNtBinaryPatch2</C_Name>
-      <Token>0x0001000c</Token>
-      <TokenSpaceGuidCName>FIX_ME_PcdWinNtBinaryPatch2</TokenSpaceGuidCName>
-      <DatumType>UINT32</DatumType>
-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
-      <DefaultValue>0x5678</DefaultValue>
-      <HelpText>HELP FIX ME!</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdWinNtFeatureFlag1</C_Name>
-      <Token>0x0001000d</Token>
-      <TokenSpaceGuidCName>FIX_ME_PcdWinNtFeatureFlag1</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>0x1</DefaultValue>
-      <HelpText>HELP FIX ME!</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdWinNtDynamicUINT32</C_Name>
-      <Token>0x0001000e</Token>
-      <TokenSpaceGuidCName>FIX_ME_PcdWinNtDynamicUINT32</TokenSpaceGuidCName>
-      <DatumType>UINT32</DatumType>
-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
-      <DefaultValue>0x0</DefaultValue>
-      <HelpText>HELP FIX ME!</HelpText>
-    </PcdEntry>
   </PcdDeclarations>
-</PackageSurfaceArea>
\ No newline at end of file
+</PackageSurfaceArea>
diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index 87c56df618..ff59bd8b71 100644
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -5709,30 +5709,6 @@
           <MaxDatumSize>8</MaxDatumSize>
           <Value>L"3000"</Value>
         </PcdData>
-        <PcdData ItemType="FEATURE_FLAG">
-          <C_Name>PcdWinNtFeatureFlag1</C_Name>
-          <Token>0x0001000d</Token>
-          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>BOOLEAN</DatumType>
-          <MaxDatumSize>1</MaxDatumSize>
-          <Value>TRUE</Value>
-        </PcdData>
-        <PcdData ItemType="PATCHABLE_IN_MODULE">
-          <C_Name>PcdWinNtBinaryPatch1</C_Name>
-          <Token>0x0001000b</Token>
-          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>
-          <MaxDatumSize>4</MaxDatumSize>
-          <Value>0x1234</Value>
-        </PcdData>
-        <PcdData ItemType="PATCHABLE_IN_MODULE">
-          <C_Name>PcdWinNtBinaryPatch2</C_Name>
-          <Token>0x0001000c</Token>
-          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>
-          <MaxDatumSize>4</MaxDatumSize>
-          <Value>0x5678</Value>
-        </PcdData>
       </PcdBuildDefinition>
       <ModuleSaBuildOptions>
         <FvBinding>FV_RECOVERY</FvBinding>
@@ -6870,4 +6846,4 @@
       <fileset dir="${FV_DIR}" includes="*.fv" />
     </copy>
   </UserExtensions-->
-</PlatformSurfaceArea>
\ No newline at end of file
+</PlatformSurfaceArea>