diff --git a/bin/cdist-deploy-to b/bin/cdist-deploy-to
index c48eba57..67bc4ba0 100755
--- a/bin/cdist-deploy-to
+++ b/bin/cdist-deploy-to
@@ -53,9 +53,9 @@ __cdist_dir push "${__cdist_abs_mydir}" "${__cdist_remote_bin_dir}"
 __cdist_dir push "${__cdist_core_dir}" "${__cdist_remote_core_dir}"
 
 __cdist_explorer_run_global
+__cdist_manifest_run_init
 exit 1
 
-__cdist_manifest_run_init
 __cdist_object_all            __cdist_object_prepare
 __cdist_object_all            __cdist_object_run
 __cdist_cache
diff --git a/core/__cdist_explorer_run b/core/__cdist_explorer_run
index d6cd29c9..c93b348f 100755
--- a/core/__cdist_explorer_run
+++ b/core/__cdist_explorer_run
@@ -23,9 +23,7 @@
 
 __cdist_explorer_run()
 {
-   # [ $# -eq 3 ] || __cdist_usage "<global|type> <explorer dir> <out dir>"
    [ $# -eq 5 ] || __cdist_usage "<global|type> <local explorer dir> <remote explorer dir> <remote out dir> <local out dir>"
-   set -x
 
    # Ensure there is at least one explorer
    num="$(ls -1 "$__cdist_explorer_dir" | wc -l)"