diff --git a/BaseTools/Source/Python/Eot/Eot.py b/BaseTools/Source/Python/Eot/Eot.py
index c4164199ac..45c97bb258 100644
--- a/BaseTools/Source/Python/Eot/Eot.py
+++ b/BaseTools/Source/Python/Eot/Eot.py
@@ -340,14 +340,6 @@ class Eot(object):
             GuidMacro2 = ''
             GuidValue = ''
 
-            # Find value for hardcode guid macro
-            if GuidName in EotGlobalData.gGuidMacroDict:
-                GuidMacro = EotGlobalData.gGuidMacroDict[GuidName][0]
-                GuidValue = EotGlobalData.gGuidMacroDict[GuidName][1]
-                SqlCommand = """update Report set GuidMacro = '%s', GuidValue = '%s' where GuidName = '%s'""" %(GuidMacro, GuidValue, GuidName)
-                EotGlobalData.gDb.TblReport.Exec(SqlCommand)
-                continue
-
             # Find guid value defined in Dec file
             if GuidName in EotGlobalData.gGuidDict:
                 GuidValue = EotGlobalData.gGuidDict[GuidName]
diff --git a/BaseTools/Source/Python/Eot/EotGlobalData.py b/BaseTools/Source/Python/Eot/EotGlobalData.py
index a4654853ab..dea4206e9d 100644
--- a/BaseTools/Source/Python/Eot/EotGlobalData.py
+++ b/BaseTools/Source/Python/Eot/EotGlobalData.py
@@ -72,10 +72,6 @@ gOP_SOURCE_FILES = open(gSOURCE_FILES, 'w+')
 # Dict for GUID found in DEC files
 gGuidDict = dict()
 
-# Dict for hard coded GUID Macros
-# {GuidName : [GuidMacro : GuidValue]}
-gGuidMacroDict = sdict()
-
 # Dict for PPI
 gPpiList = {}