diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index 0b7f53757a..811a4d4bd7 100644
--- a/Tools/Conf/BuildMacro.xml
+++ b/Tools/Conf/BuildMacro.xml
@@ -649,7 +649,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
               <fileset casesensitive="on" file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.c"/>
             </command>
           </cc>
-          <delete file="${PLATFORM_DIR}/@{FILENAME}.i" />
         </sequential>
       </OnDependency>
       <!-- Since fileset can't scan file start with ./, remove ./ in previous. -->
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FwImageTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FwImageTask.java
index b84ea47595..13df297fa6 100644
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FwImageTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FwImageTask.java
@@ -25,9 +25,6 @@ import org.apache.tools.ant.taskdefs.Execute;
 import org.apache.tools.ant.taskdefs.LogStreamHandler;
 import org.apache.tools.ant.types.Commandline;
 
-import org.tianocore.common.logger.EdkLog;
-
-
 /**
   FwImageTask class.
 
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java
index 5c4de1a78e..874e08ce2f 100644
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java
@@ -25,8 +25,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import java.util.StringTokenizer;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -47,7 +45,6 @@ public class MakeDeps extends Task {
     // private members, use set/get to access them
     //
     private static final String cmdName = "MakeDeps";
-    private static final String target  = "dummy";
     private String              includePath = null;
     private String              depsFile = null;
     private String              subDir = null;
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/VfrCompilerTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/VfrCompilerTask.java
index 052c24e1fc..3d940cb297 100644
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/VfrCompilerTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/VfrCompilerTask.java
@@ -38,6 +38,7 @@ import org.apache.tools.ant.types.Commandline;
 public class VfrCompilerTask extends Task implements EfiDefine {
     private String createListFile = "";
     private String outPutDir = "";
+    private File outPutFile;
     private String createIfrBinFile = "";
     private String processerArg ="";
     private String vfrFile = "";
@@ -79,6 +80,9 @@ public class VfrCompilerTask extends Task implements EfiDefine {
      @param     outPutDir   The directory name for ouput file
      **/
     public void setOutPutDir(String outPutDir) {
+        if (outPutDir != null) {
+            outPutFile = new File(outPutDir);
+        }
         this.outPutDir = " -od " + outPutDir;
     }
 
@@ -204,7 +208,12 @@ public class VfrCompilerTask extends Task implements EfiDefine {
 
             Execute runner = new Execute(streamHandler,null);
             runner.setAntRun(project);
+            
             runner.setCommandline(commandLine.getCommandline());
+            
+            if (outPutFile != null && outPutFile.exists()) {
+                runner.setWorkingDirectory(outPutFile); 
+            }
 
             log(Commandline.toString(commandLine.getCommandline()), Project.MSG_VERBOSE);
             log(vfrFileName);
diff --git a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java b/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
index fe7a8ce70d..b8d92ed33e 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
@@ -179,6 +179,18 @@ public class FrameworkBuildTask extends Task{
             fpdParserTask.setProject(getProject());
             fpdParserTask.setFpdFile(buildFile);
             fpdParserTask.execute();
+            
+            //
+            // If cleanall delete the Platform_build.xml
+            //
+            if (type.compareTo("cleanall") == 0) {
+                File platformBuildFile = 
+                    new File(getProject().getProperty("PLATFORM_DIR") 
+                                    + File.separatorChar 
+                                    + getProject().getProperty("PLATFORM") 
+                                    + "_build.xml");
+                platformBuildFile.deleteOnExit();
+            }
         }
         
         //
diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java b/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java
index 3ac976acfb..5cb8e6f3e9 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java
@@ -540,7 +540,6 @@ public class GlobalData {
             }
         }
         return null;
-
     }
 
     /**
diff --git a/Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainInfo.java b/Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainInfo.java
index 4ccc4c6d91..9952c0beda 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainInfo.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainInfo.java
@@ -328,7 +328,10 @@ public class ToolChainInfo {
        @return String
      **/
     public String toString() {
-        return targets + "\n" + tagnames + "\n" + archs + "\n" + commands;
+        return  "  TARGET :" + targets + "\n" + 
+                "  TAGNAME:" + tagnames + "\n" + 
+                "  ARCH   :" + archs + "\n" + 
+                "  COMMAND:" + commands;
     }
 
     /**