diff --git a/pisi/pxml/xmlext.py b/pisi/pxml/xmlext.py
index e910eb60..52c25dcb 100644
--- a/pisi/pxml/xmlext.py
+++ b/pisi/pxml/xmlext.py
@@ -16,16 +16,16 @@ try:
     from xmlextpiks import *
 except:
     try:
-        gibidi
-        if pisi.context.use_mdom:
-            raise Error('zibidi')
+        #if pisi.context.use_mdom:
+        #    gibidi
+        #else:
+            
         from xmlextcdom import  *
     except:
         #raise Error('cannot find 4suite implementation')
         print 'xmlext: cDomlette/piksemel implementation cannot be loaded, falling back to minidom'
         from xmlextmdom import *
 
-
 from xml.dom import XHTML_NAMESPACE, XML_NAMESPACE
 XHTML_NS = unicode(XHTML_NAMESPACE)
 XML_NS = unicode(XML_NAMESPACE)
diff --git a/pisi/pxml/xmlfile.py b/pisi/pxml/xmlfile.py
index c09c754e..073bb725 100644
--- a/pisi/pxml/xmlfile.py
+++ b/pisi/pxml/xmlfile.py
@@ -18,13 +18,13 @@ try:
     #from xmlfilepiks import *
 except:
     try:
-        zibidi
-        if pisi.context.use_mdom:
-            raise Error('zibidi')
+        #if pisi.context.use_mdom:
+        #    zibidi
+        #else:
         from xmlfilecdom import *
     except:
         #raise Error('cannot find 4suite implementation')
         print 'xmlext: cDomlette/piksemel implementation cannot be loaded, falling back to minidom'
         from xmlfilemdom import *
 
-print 'gumburdop'
+#print 'gumburdop'
diff --git a/pisi/pxml/xmlfilemdom.py b/pisi/pxml/xmlfilemdom.py
index 1555c087..b1939a5b 100644
--- a/pisi/pxml/xmlfilemdom.py
+++ b/pisi/pxml/xmlfilemdom.py
@@ -33,7 +33,6 @@ from xml.parsers.expat import ExpatError
 import codecs
 
 import pisi
-from pisi.pxml.xmlextcdom import *
 from pisi.file import File
 
 class Error(pisi.Error):
diff --git a/tools/calc-build-order.py b/tools/calc-build-order.py
index 9adbd11a..2f92633f 100755
--- a/tools/calc-build-order.py
+++ b/tools/calc-build-order.py
@@ -4,12 +4,10 @@
 
 import sys
 import os
-
 sys.path.insert(0, '.')
 
 import pisi.context as ctx
-ctx.usemdom = True
-print 'hobarey'
+#ctx.usemdom = True
 import pisi
 import pisi.api
 import pisi.config
@@ -35,26 +33,18 @@ for root, dirs, files in os.walk(repo_uri):
             sf.read(pisi.util.join_path(root, fn))
             sf.check()
             print 'read %s: %s' % (sf.source.name, sf.source.version)
-            
             specfiles.append(sf)
 
-#print specfiles
-
 def plan_build(specfiles):
     # try to construct a pisi graph of packages to
     # install / reinstall
 
-    G_f = Digraph()
-    #pgraph.PGraph(packagedb)               # construct G_f
-    
+    G_f = Digraph()    
     pkgtosrc = {}
-
     for sf in specfiles:
         for pkg in sf.packages:
             pkgtosrc[str(pkg.name)] = str(sf.source.name) 
     
-    # find the "install closure" graph of G_f by package 
-    # set A using packagedb
     for x in specfiles:
         #G_f.add_package(x)
         src = x.source