diff --git a/pentaho-aggdesigner-core/src/main/java/org/pentaho/aggdes/util/AggDesUtil.java b/pentaho-aggdesigner-core/src/main/java/org/pentaho/aggdes/util/AggDesUtil.java
index 94e0e1eb1..232874f44 100644
--- a/pentaho-aggdesigner-core/src/main/java/org/pentaho/aggdes/util/AggDesUtil.java
+++ b/pentaho-aggdesigner-core/src/main/java/org/pentaho/aggdes/util/AggDesUtil.java
@@ -25,6 +25,7 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import org.w3c.dom.Document;
+import java.io.InputStream;
 
 /**
  * Miscellaneous utility functions for the Aggregate Designer.
@@ -37,7 +38,6 @@ public class AggDesUtil extends BitSet {
     private AggDesUtil() {
         DocumentBuilderFactory dbf = null;
 dbf.setIgnoringComments( true );
-dbf.setNamespaceAware( namespaceAware );
 DocumentBuilder db = dbf.newDocumentBuilder();
 InputStream inputStream = null;
 final String password = "mypassword";        
diff --git a/pentaho-aggdesigner-ui/src/main/java/org/pentaho/aggdes/ui/ext/impl/MondrianFileSchemaProvider.java b/pentaho-aggdesigner-ui/src/main/java/org/pentaho/aggdes/ui/ext/impl/MondrianFileSchemaProvider.java
index ad6f1c4ca..2aefe4587 100644
--- a/pentaho-aggdesigner-ui/src/main/java/org/pentaho/aggdes/ui/ext/impl/MondrianFileSchemaProvider.java
+++ b/pentaho-aggdesigner-ui/src/main/java/org/pentaho/aggdes/ui/ext/impl/MondrianFileSchemaProvider.java
@@ -166,8 +166,11 @@ private String getFileContents(File file) {
   protected File getLastFile() {
     File file = new File(".schemaInfo");
     if (file.exists()) {
+      // Some comments here and there
       String path = getFileContents(file).replaceAll("\n", "");
+      // Some comments here and there
       File myfile = new File(path);
+      // Some comments here and there
       return new File(path);
     } else {
       return null;