diff --git a/src/tm_mad/qcow2/ln.ssh b/src/tm_mad/qcow2/ln.ssh
index abaef38141..5a53fd5080 100755
--- a/src/tm_mad/qcow2/ln.ssh
+++ b/src/tm_mad/qcow2/ln.ssh
@@ -28,10 +28,8 @@ SRC=$1
 DST=$2
 
 if [ -z "${ONE_LOCATION}" ]; then
-    LIB_LOCATION=/usr/lib/one
     TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh
 else
-    LIB_LOCATION=$ONE_LOCATION/lib
     TMCOMMON=$ONE_LOCATION/var/remotes/tm/tm_common.sh
 fi
 
diff --git a/src/tm_mad/qcow2/mv b/src/tm_mad/qcow2/mv
index 911769f891..d70ca370ae 100755
--- a/src/tm_mad/qcow2/mv
+++ b/src/tm_mad/qcow2/mv
@@ -26,9 +26,6 @@
 SRC=$1
 DST=$2
 
-VMID=$3
-DSID=$4
-
 if [ -z "${ONE_LOCATION}" ]; then
     TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh
 else
@@ -37,23 +34,17 @@ fi
 
 . $TMCOMMON
 
-SRC=`fix_dir_slashes $SRC`
-DST=`fix_dir_slashes $DST`
+SRC=$(fix_dir_slashes $SRC)
+DST=$(fix_dir_slashes $DST)
 
-SRC_PATH=`arg_path $SRC`
-DST_PATH=`arg_path $DST`
+SRC_PATH=$(arg_path $SRC)
+DST_PATH=$(arg_path $DST)
 
-SRC_HOST=`arg_host $SRC`
-DST_HOST=`arg_host $DST`
-
-DST_DIR=`dirname $DST_PATH`
-
-SRC_DS_DIR=`dirname  $SRC_PATH`
-SRC_VM_DIR=`basename $SRC_PATH`
+DST_HOST=$(arg_host $DST)
 
 # Return if moving a disk, we will move them when moving the whole system_ds
 # directory for the VM
-if [ `is_disk $DST_PATH` -eq 1 ]; then
+if [ "$(is_disk $DST_PATH)" -eq 1 ]; then
     exit 0
 fi
 
diff --git a/src/tm_mad/qcow2/snap_create b/src/tm_mad/qcow2/snap_create
index 65696bcfb7..105c6cfd6f 100755
--- a/src/tm_mad/qcow2/snap_create
+++ b/src/tm_mad/qcow2/snap_create
@@ -21,14 +21,11 @@
 SRC=$1
 SNAP_ID=$2
 VMID=$3
-DSID=$4
 
 if [ -z "${ONE_LOCATION}" ]; then
     TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh
-    DATASTORES=/var/lib/one/datastores
 else
     TMCOMMON=$ONE_LOCATION/var/remotes/tm/tm_common.sh
-    DATASTORES=$ONE_LOCATION/var/datastores
 fi
 
 DRIVER_PATH=$(dirname $0)
@@ -62,7 +59,6 @@ FORMAT="${XPATH_ELEMENTS[j++]}"
 SYSTEM_DS_PATH=$(dirname ${SRC_PATH})
 
 SYSTEM_DS_DISK_PATH="${SYSTEM_DS_PATH}/disk.${DISK_ID}"
-SYSTEM_DS_DISK_PATH_SHORT="disk.${DISK_ID}"
 
 if [ "$CLONE" = "YES" ]; then
     DISK_PATH="${SYSTEM_DS_DISK_PATH}"
@@ -76,7 +72,7 @@ SNAP_DIR="${DISK_PATH}.snap"
 SNAP_DIR_SHORT="${DISK_PATH_SHORT}.snap"
 
 if [ "$FORMAT" = "qcow2" ]; then
-    NEXT_SNAP_ID=$(($SNAP_ID+1))
+    NEXT_SNAP_ID=$((SNAP_ID+1))
     SNAP_PATH="${SNAP_DIR}/${NEXT_SNAP_ID}"
     SNAP_PATH_SHORT="${SNAP_DIR_SHORT}/${NEXT_SNAP_ID}"
 
diff --git a/src/tm_mad/qcow2/snap_delete.ssh b/src/tm_mad/qcow2/snap_delete.ssh
index d595f6c2b2..f5706b4900 100755
--- a/src/tm_mad/qcow2/snap_delete.ssh
+++ b/src/tm_mad/qcow2/snap_delete.ssh
@@ -20,18 +20,13 @@
 
 SRC=$1
 SNAP_ID=$2
-VMID=$3
-DSID=$4
 
 if [ -z "${ONE_LOCATION}" ]; then
     TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh
-    DATASTORES=/var/lib/one/datastores
 else
     TMCOMMON=$ONE_LOCATION/var/remotes/tm/tm_common.sh
-    DATASTORES=$ONE_LOCATION/var/datastores
 fi
 
-DRIVER_PATH=$(dirname $0)
 
 . $TMCOMMON