diff --git a/bin/cdist-mass-deploy b/bin/cdist-mass-deploy
index ab6c8f1b..99638490 100755
--- a/bin/cdist-mass-deploy
+++ b/bin/cdist-mass-deploy
@@ -30,12 +30,7 @@ trap killandclean EXIT
 
 killandclean()
 {
-   # i may have been altered outside, just use the current offset
-   while [ "$i" -gt 0 ]; do
-      eval pid=\$pid_$i
-      kill "$pid"
-      i=$((i-1))
-   done
+   kill 0
 
    # Ensure tmp stuff is being removed
    __cdist_tmp_removal