diff --git a/bin/cdist-explorer-run-global b/bin/cdist-explorer-run-global
index b13b898f..5e9c5a09 100755
--- a/bin/cdist-explorer-run-global
+++ b/bin/cdist-explorer-run-global
@@ -23,7 +23,7 @@
 
 . cdist-config
 [ $# -eq 1 ] || __cdist_usage "<target_host>"
-set -ue
+set -uex
 
 __cdist_target_host="$1"; shift
 
@@ -33,7 +33,7 @@ __cdist_echo info "Running global explorers "
 __cdist_dir push "${__cdist_explorer_dir}" "${__cdist_remote_explorer_dir}"
 
 # run the initial explorers remotely
-__cdist_run_remote cdist-remote-explorer-run  \
+__cdist_run_remote __cdist_remote_explorer_run  \
    "$__cdist_name_var_explorer" "$__cdist_remote_explorer_dir"       \
    "$__cdist_remote_out_explorer_dir"
 
diff --git a/bin/cdist-remote-explorer-run b/core/__cdist_remote_explorer_run
similarity index 98%
rename from bin/cdist-remote-explorer-run
rename to core/__cdist_remote_explorer_run
index 040e36a2..a7958a41 100755
--- a/bin/cdist-remote-explorer-run
+++ b/core/__cdist_remote_explorer_run
@@ -24,11 +24,9 @@
 # and __type_explorers can be submitted :-)
 #
 
-# FIXME: cleanup!
 __cdist_remote_explorer_run()
 {
    [ $# -eq 3 ] || __cdist_usage "<variable name> <explorer dir> <out dir>"
-   set -ue
 
    "$__cdist_name_var_object=\"$(__cdist_remote_object_dir "$__cdist_object_self")\""