diff --git a/bin/cdist-config b/bin/cdist-config
index 31462178..56a06025 100755
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -352,6 +352,7 @@ __cdist_remote_type_explorer_dir()
 #
 __cdist_tmp_removal()
 {
+   kill 0
    rm -rf "${__cdist_tmp_dir}"
 }
 
diff --git a/bin/cdist-mass-deploy b/bin/cdist-mass-deploy
index 99638490..96427f7a 100755
--- a/bin/cdist-mass-deploy
+++ b/bin/cdist-mass-deploy
@@ -30,10 +30,11 @@ trap killandclean EXIT
 
 killandclean()
 {
+   __cdist_echo info "Existing and killing children..." 
    kill 0
 
    # Ensure tmp stuff is being removed
-   __cdist_tmp_removal
+   __cdist_cleanly_exit
 }