diff --git a/src/im_mad/vmware/im_vmwarerc b/src/im_mad/vmware/im_vmwarerc
index 4dba198c4c..8265c36e3c 100644
--- a/src/im_mad/vmware/im_vmwarerc
+++ b/src/im_mad/vmware/im_vmwarerc
@@ -22,8 +22,3 @@
 # Uncomment the following line to active MAD debug  
 #ONE_MAD_DEBUG=1
 
-# Datastore name
-VMWARE_DATASTORE=datastore1
-
-# Datacenter name
-VMWARE_DATACENTER=ha-datacenter
diff --git a/src/im_mad/vmware/one_im_vmware b/src/im_mad/vmware/one_im_vmware
index 7b6d0c2ff9..ca4aa81f60 100755
--- a/src/im_mad/vmware/one_im_vmware
+++ b/src/im_mad/vmware/one_im_vmware
@@ -47,9 +47,9 @@ fi
 
 # Execute the actual MAD
 if [ -n "${ONE_MAD_DEBUG}" ]; then
-    exec nice -n $PRIORITY java -cp $ONE_LOCATION/lib/mads:$CLASSPATH -Ddebug=$ONE_MAD_DEBUG -Ddatastore=$VMWARE_DATASTORE -Ddatacenter=$VMWARE_DATACENTER -Djavax.net.ssl.trustStore=$VMWARE_TRUSTORE -Xmx1024M $MAD_FILE $* 2>> $MAD_LOG_PATH
+    exec nice -n $PRIORITY java -cp $ONE_LOCATION/lib/mads:$CLASSPATH -Ddebug=$ONE_MAD_DEBUG -Djavax.net.ssl.trustStore=$VMWARE_TRUSTORE -Xmx1024M $MAD_FILE $* 2>> $MAD_LOG_PATH
 else
-    exec nice -n $PRIORITY java -cp $ONE_LOCATION/lib/mads:$CLASSPATH -Ddebug=$ONE_MAD_DEBUG -Ddatastore=$VMWARE_DATASTORE -Ddatacenter=$VMWARE_DATACENTER -Djavax.net.ssl.trustStore=$VMWARE_TRUSTORE -Xmx1024M $MAD_FILE $* 2> /dev/null
+    exec nice -n $PRIORITY java -cp $ONE_LOCATION/lib/mads:$CLASSPATH -Ddebug=$ONE_MAD_DEBUG -Djavax.net.ssl.trustStore=$VMWARE_TRUSTORE -Xmx1024M $MAD_FILE $* 2> /dev/null
 fi
 
 
diff --git a/src/tm_mad/vmware/tm_vmwarerc b/src/tm_mad/vmware/tm_vmwarerc
index 959f34821c..d1e202e5d9 100644
--- a/src/tm_mad/vmware/tm_vmwarerc
+++ b/src/tm_mad/vmware/tm_vmwarerc
@@ -18,8 +18,5 @@
 # Uncomment the following line to active MAD debug  
 #ONE_MAD_DEBUG=1
 
-# Name of the ESX(i) datastore
-DATASTORE=datastore1
-
 # Local path of the datastore
 DATASTORE_PATH=/images/vmware