diff --git a/bin/cdist-manifest-run-all b/bin/cdist-manifest-run-all
index c0de5b8b..dcd5222d 100755
--- a/bin/cdist-manifest-run-all
+++ b/bin/cdist-manifest-run-all
@@ -68,13 +68,11 @@ while [ "$__cdist_new_objects_created" = "y"  ]; do
             echo "Executing manifest ${__cdist_manifest} ..."
 
             # Make variables available to non-core
-            set -x
             export $__cdist_name_var_object="$__cdist_cur_object_dir"
             export $__cdist_name_var_object_id="$__cdist_object_id"
-            set +x
 
             cdist-manifest-run "$__cdist_target_host" "$__cdist_manifest" \
-               "$__cdist_new_objects_dir" "$__cdist_object_id"
+               "$__cdist_new_objects_dir"
 
             __cdist_object_list "${__cdist_new_objects_dir}" > "$__cdist_new_objects_list"
 
diff --git a/conf/manifests/init b/conf/manifests/init
index f28f293e..2bc47e15 100755
--- a/conf/manifests/init
+++ b/conf/manifests/init
@@ -6,13 +6,6 @@
 echo "Running initial manifest for $__target_host"
 echo "We could access other manifests in $__manifests"
 
-set -x
-
-# All systems get a file /etc/cdist-managed, so the sysadmin knows
-# who manages the configuration.
-#__file /etc/cdist-managed --type file
-
-# All ikqs get a sample file
 case "$__target_host" in
    localhost)
       __issue iddoesnotmatterhere