diff --git a/src/im_mad/vmware/im_vmware.conf b/src/im_mad/vmware/im_vmware.conf
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/vmm_mad/vmware/DeployVM.java b/src/vmm_mad/vmware/DeployVM.java
index 714be3ade3..4c8f72ff0b 100644
--- a/src/vmm_mad/vmware/DeployVM.java
+++ b/src/vmm_mad/vmware/DeployVM.java
@@ -336,7 +336,7 @@ public class DeployVM
          
          // Let's remove existing NICs
          
-         for(int i=0;i<test.length;i++)
+       /*  for(int i=0;i<test.length;i++)
          {
              VirtualDeviceConfigSpec nicSpec = new VirtualDeviceConfigSpec(); 
              VirtualEthernetCard nic;
@@ -348,14 +348,14 @@ public class DeployVM
              
              nicSpecArray[i] = nicSpec;
          }
-         
+         */
          
         // Let's add specified NICs
          
          for(int i=0;i<nics.length;i++)
          {
              VirtualDeviceConfigSpec nicSpec = new VirtualDeviceConfigSpec();
-             // TODO make this dynamic?
+             // TODO make this dynamic
              String networkName = "one-net"; 
              
              nicSpec.setOperation(VirtualDeviceConfigSpecOperation.add);
diff --git a/src/vmm_mad/vmware/ParseXML.java b/src/vmm_mad/vmware/ParseXML.java
index 102e5e1510..321dba4d27 100644
--- a/src/vmm_mad/vmware/ParseXML.java
+++ b/src/vmm_mad/vmware/ParseXML.java
@@ -85,7 +85,7 @@ public class ParseXML
                 
                 for(int i=0; i<diskNL.getLength(); i++)
                 {
-                    NodeList sourceNode = ((Element)diskNL).getElementsByTagName("SOURCE");
+                    NodeList sourceNode = ((Element)diskNL.item(i)).getElementsByTagName("SOURCE");
                     
                     disk[i] = ((Node)sourceNode.item(0)).getFirstChild().getNodeValue().trim();
                 }
@@ -101,7 +101,7 @@ public class ParseXML
                 
                 for(int i=0; i<nwNL.getLength(); i++)
                 {
-                    NodeList mac = ((Element)nwNL).getElementsByTagName("MAC");
+                    NodeList mac = ((Element)nwNL.item(i)).getElementsByTagName("MAC");
                     
                     macs[i] = ((Node)mac.item(0)).getFirstChild().getNodeValue().trim();
                 }
diff --git a/src/vmm_mad/vmware/vmm_vmware.conf b/src/vmm_mad/vmware/vmm_vmware.conf
deleted file mode 100644
index e69de29bb2..0000000000