diff --git a/doc/dev/todo/BUGS b/doc/dev/todo/BUGS
deleted file mode 100644
index 80fc6232..00000000
--- a/doc/dev/todo/BUGS
+++ /dev/null
@@ -1,7 +0,0 @@
-Stuff that needs to repaired very soon as they may cause frustration...
-
-__process / name bug:
-    __process /usr/lib/postfix/master --start "/etc/rc.d/postfix start" --state running
-    => name="usr/lib/postfix/master"
-    => breaks!
-    => cannot detect if ^/ is needed or not automatically
diff --git a/doc/dev/todo/TAKEME b/doc/dev/todo/TAKEME
index 701478e0..d6bd81a3 100644
--- a/doc/dev/todo/TAKEME
+++ b/doc/dev/todo/TAKEME
@@ -3,10 +3,17 @@ UNASSIGNED TODOS
 The following list of todos has not been assigned to any developer.
 Feel free to pick one!
 
-CORE
+
+BUGS
 ----
-- Add subcommand to create template of a type with working manpage
- (cdist type-template or so)
+
+Stuff that needs to repaired very soon as they may cause frustration...
+
+__process / name bug:
+    __process /usr/lib/postfix/master --start "/etc/rc.d/postfix start" --state running
+    => name="usr/lib/postfix/master"
+    => breaks!
+    => cannot detect if ^/ is needed or not automatically
 
 TESTS
 -----
@@ -20,11 +27,8 @@ TESTS
 
 USER INTERFACE
 --------------
-- add support $__tmp?
-   - for use in manifest, code, etc.?
-      - for creating temporary files, etc.
-
 - How to cleanly implement "restart service if config file changed"
+    -> document
 
 - Cache
    - add example how to use 
@@ -42,12 +46,5 @@ USER INTERFACE
 
 TYPES
 ------
-- __ssh-keys (host/user)
 - __user
    add option to include --create-home
-
-DOCUMENTATION
---------------
-- asciidoc interprets __, which we use for variables
-  names -> seek through docs and replace with \_\_!
-- reference explorers in cdist-reference!
diff --git a/doc/dev/todo/install b/doc/dev/todo/install
deleted file mode 100644
index f0e7a040..00000000
--- a/doc/dev/todo/install
+++ /dev/null
@@ -1,8 +0,0 @@
-missing types:
-   __bootloader
-   __taball_get
-   __mount
-   __mount-point-create
-   __fstab
-   - run user postinstall script
-      - for e.g. reboot, chroot && start sshd
diff --git a/doc/dev/todo/niconext b/doc/dev/todo/niconext
index f8c2d6da..66e1baee 100644
--- a/doc/dev/todo/niconext
+++ b/doc/dev/todo/niconext
@@ -297,32 +297,5 @@ pointers on where to continue to read:
 eof
 --------------------------------------------------------------------------------
 
-- Initial install support
-   - setup $__install = "yes" for
-      manifest(s), gencode-*
-
-   - run standard manifest (?)
-      - creates initial objects
-         - only those having the installer flag?
-            - requires changegs to cdist-type-emulator!
-               - Goto Rewrite cdist-type-emulator
-
-   - run all other manifests
-      - creates all objects
-      - what about type explorer?
-         - do not run, create empty output (types should be able
-            to handle this!)
-            via __global/
-
-- Support parallel execution
-   - error handling / report failed hosts
-
 - Create new video for cdist 2.0.0
    http://www.youtube.com/watch?v=PRMjzy48eTI
-
-- Setup __debug, if -d is given, so other tools can reuse it
-   - implement everywhere to external!
-
-- remote_prefix:
-   scp vs. ssh issue
-locale_type