diff --git a/SubSystems/Dragnet/scripts/LOFAR-Dragnet-deploy.sh b/SubSystems/Dragnet/scripts/LOFAR-Dragnet-deploy.sh
index cbe2dae6341a753f3fcf59c618e1115f5d32e4e7..d47cb989dc4a8b46b84cd958f70f8d9fd3680e0b 100755
--- a/SubSystems/Dragnet/scripts/LOFAR-Dragnet-deploy.sh
+++ b/SubSystems/Dragnet/scripts/LOFAR-Dragnet-deploy.sh
@@ -104,8 +104,9 @@ for host in $nodelist; do
     cd / && tar -x -z --no-overwrite-dir -f $lofar_versions_root/$archive && \
     rm -rf -- $prefix/var && \
     ln -sfT /home/lofarsys/lofar/var $prefix/var && \
+    rm -- \"$lofar_versions_root/$archive\" && \
     cd $lofar_versions_root && \
-    ( [ -z "$envmodfilename" ] || mv $envmodfilename /etc/modulefiles/lofar/ ) && \
+    ( [ -z \"$envmodfilename\" ] || mv $envmodfilename /etc/modulefiles/lofar/ ) && \
     sudo -n /sbin/setcap cap_net_raw,cap_sys_nice,cap_ipc_lock=ep $prefix/bin/rtcp && \
     sudo -n /sbin/setcap cap_net_raw,cap_sys_nice,cap_ipc_lock=ep $prefix/bin/outputProc && \
     sudo -n /sbin/setcap cap_net_raw,cap_sys_nice,cap_ipc_lock=ep $prefix/bin/TBB_Writer && \