diff --git a/DuetPkg/DataHubGenDxe/DataHubGen.h b/DuetPkg/DataHubGenDxe/DataHubGen.h
index 9cf4e4b00c..8697897703 100644
--- a/DuetPkg/DataHubGenDxe/DataHubGen.h
+++ b/DuetPkg/DataHubGenDxe/DataHubGen.h
@@ -1,6 +1,6 @@
 /** @file
 
-Copyright (c) 2006 - 2007, Intel Corporation                                                         
+Copyright (c) 2006 - 2010, Intel Corporation                                                         
 All rights reserved. This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -45,17 +45,9 @@ Abstract:
 
 #define   FIRMWARE_PRODUCT_NAME         (PRODUCT_NAME L": ")
 #ifdef EFI32
-#if (EFI_SPECIFICATION_VERSION >= 0x00020000)
 #define   FIRMWARE_BIOS_VERSIONE        (PRODUCT_NAME L"(IA32.UEFI)" PRODUCT_VERSION L": ")
-#else
-#define   FIRMWARE_BIOS_VERSIONE        (PRODUCT_NAME L"(IA32.EFI)"  PRODUCT_VERSION L": ")
-#endif
 #else  // EFIX64
-#if (EFI_SPECIFICATION_VERSION >= 0x00020000)
 #define   FIRMWARE_BIOS_VERSIONE        (PRODUCT_NAME L"(X64.UEFI)"  PRODUCT_VERSION L": ")
-#else
-#define   FIRMWARE_BIOS_VERSIONE        (PRODUCT_NAME L"(X64.EFI)"   PRODUCT_VERSION L": ")
-#endif
 #endif
 
 SMBIOS_STRUCTURE_POINTER
diff --git a/DuetPkg/FSVariable/FSVariable.h b/DuetPkg/FSVariable/FSVariable.h
index 2abec3eeba..c855150a80 100644
--- a/DuetPkg/FSVariable/FSVariable.h
+++ b/DuetPkg/FSVariable/FSVariable.h
@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2006 - 2007, Intel Corporation                                                         
+Copyright (c) 2006 - 2010, Intel Corporation                                                         
 All rights reserved. This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -143,7 +143,6 @@ SetVariable (
   IN VOID                    *Data
   );
 
-#if (EFI_SPECIFICATION_VERSION >= 0x00020000)
 EFI_STATUS
 EFIAPI
 QueryVariableInfo (
@@ -152,6 +151,5 @@ QueryVariableInfo (
   OUT UINT64                 *RemainingVariableStorageSize,
   OUT UINT64                 *MaximumVariableSize
   );
-#endif // EFI_SPECIFICATION_VERSION >= 0x00020000
 
 #endif
diff --git a/DuetPkg/SmbiosGenDxe/SmbiosGen.h b/DuetPkg/SmbiosGenDxe/SmbiosGen.h
index 45e6b24477..6201747bff 100644
--- a/DuetPkg/SmbiosGenDxe/SmbiosGen.h
+++ b/DuetPkg/SmbiosGenDxe/SmbiosGen.h
@@ -1,6 +1,6 @@
 /** @file
 
-Copyright (c) 2009, Intel Corporation                                                         
+Copyright (c) 2009 - 2010, Intel Corporation                                                         
 All rights reserved. This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -45,17 +45,9 @@ Abstract:
 
 #define   FIRMWARE_PRODUCT_NAME         (PRODUCT_NAME L": ")
 #ifdef EFI32
-#if (EFI_SPECIFICATION_VERSION >= 0x00020000)
 #define   FIRMWARE_BIOS_VERSIONE        (PRODUCT_NAME L"(IA32.UEFI)" PRODUCT_VERSION L": ")
-#else
-#define   FIRMWARE_BIOS_VERSIONE        (PRODUCT_NAME L"(IA32.EFI)"  PRODUCT_VERSION L": ")
-#endif
 #else  // EFIX64
-#if (EFI_SPECIFICATION_VERSION >= 0x00020000)
 #define   FIRMWARE_BIOS_VERSIONE        (PRODUCT_NAME L"(X64.UEFI)"  PRODUCT_VERSION L": ")
-#else
-#define   FIRMWARE_BIOS_VERSIONE        (PRODUCT_NAME L"(X64.EFI)"   PRODUCT_VERSION L": ")
-#endif
 #endif
 
 SMBIOS_STRUCTURE_POINTER