diff --git a/core/__cdist_explorer_run b/core/__cdist_explorer_run
index c93b348f..9e58fa09 100755
--- a/core/__cdist_explorer_run
+++ b/core/__cdist_explorer_run
@@ -18,7 +18,7 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 #
-# Run explorers
+# Run explorers - FIXME: this function is ugly
 #
 
 __cdist_explorer_run()
@@ -47,7 +47,7 @@ __cdist_explorer_run()
    # Create output directory
    __cdist_run_remote mkdir -p "$4"
 
-   # Execute all explorers
+   # Execute all explorers - FIXME: isolate cd call?
    cd "$2";
    # FIXME: cleanup double variable, no need when in directory
    for __cdist_explorer_run_explorer in *; do
diff --git a/doc/dev/todo/niconext b/doc/dev/todo/niconext
index d37658ea..3c3300e1 100644
--- a/doc/dev/todo/niconext
+++ b/doc/dev/todo/niconext
@@ -1,36 +1,3 @@
-core/__cdist_object_code_run:
-   make remote run work again
-
-__cdist_code_run:
-   should be changed to run _all_ code (has nice checks)
-
---------------------------------------------------------------------------------
-- run-remote does not work anymore, because there is no binary :-)
-   either make functions available on the other side or
-   put logic on the server side.
-
-   - trying to run type explorers nicely from local side
-      - must check whether type directory has been transmitted before!
-
---------------------------------------------------------------------------------
-
-
-   - Both type and global have...
-      - local sourcedir
-      - remote destination dir
-      - remote out dir
-      - local out dir
-
-   - Differences are in...
-      - variables exposed / submitted
-
-  
-
-
-Catch broken instances in cdist-mass-deploy -p and report broken deployements at the end!
-
-
---------------------------------------------------------------------------------
 Bug with requirements when indirect requires is scheduled late:
 
 __package/collectd: Generating local code