diff --git a/doc/dev/todo/niconext b/doc/dev/todo/niconext
index 738cd692..b1b77a27 100644
--- a/doc/dev/todo/niconext
+++ b/doc/dev/todo/niconext
@@ -1,7 +1,5 @@
 For 2.0.0:
 
-   - Remove all FIXME entries
-   - Remove obsolete manpages
    - support subcommands!
       deploy? config?
 
@@ -17,4 +15,6 @@ For 2.0.0:
 - Rewrite cdist-type-emulator
    - Remove legacy code in cdist
    - Remove cdist-config
+   - Remove man1/cdist-type-emulator.text
 
+- Replace bin/cdist-type-template