diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
index 01aa129cd5..b6cd6330d4 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
@@ -30,8 +30,8 @@ public final class ModuleInfo {
     public final String modulepath;
     public final String temppath;
     
-    private MsaOwner msaowner = new MsaWriter(this);
-    public ModuleSurfaceAreaDocument msadoc = ModuleSurfaceAreaDocument.Factory.newInstance();
+    //private MsaOwner msaowner = new MsaWriter(this);
+    //public ModuleSurfaceAreaDocument msadoc = ModuleSurfaceAreaDocument.Factory.newInstance();
     
     public String modulename = null;
     public String guidvalue = null;
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java b/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
index 15fafe381d..2da3c98a23 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
@@ -22,11 +22,11 @@ import org.apache.xmlbeans.*;
 public class MsaWriter implements MsaOwner {
 	MsaWriter(ModuleInfo moduleinfo) {
 		mi = moduleinfo;
-		msadoc = mi.msadoc;
+		//msadoc = mi.msadoc;
 	}
 	
     private ModuleInfo mi;
-    private ModuleSurfaceAreaDocument msadoc;
+    private ModuleSurfaceAreaDocument msadoc = ModuleSurfaceAreaDocument.Factory.newInstance();
     
     private ModuleSurfaceAreaDocument.ModuleSurfaceArea msa = msadoc.addNewModuleSurfaceArea();
     private MsaHeaderDocument.MsaHeader msaheader = msa.addNewMsaHeader();