diff --git a/doc/dev/todo/niconext b/doc/dev/todo/niconext
index 14098099..b7748949 100644
--- a/doc/dev/todo/niconext
+++ b/doc/dev/todo/niconext
@@ -8,7 +8,9 @@
       - and that ssh will wait for answer of prompt
          - nasty if used in parallel mode (scroll up!)
 
-- rewrite cdist-stages
+- rewrite cdist-stages, remove
+- update man7!
+- exec flag is not true for manifest anymore
 
 SSH HINTS
 ---------
diff --git a/doc/man/man7/cdist-type.text b/doc/man/man7/cdist-type.text
index 1af386fb..2439876c 100644
--- a/doc/man/man7/cdist-type.text
+++ b/doc/man/man7/cdist-type.text
@@ -35,10 +35,6 @@ __file /etc/cdist-configured --type file
 __package tree --state installed
 --------------------------------------------------------------------------------
 
-Internally cdist-type-emulator(1) will be called from cdist-manifest-run(1) to
-save the given parameters into a cconfig database, so they can be accessed by
-the manifest and gencode scripts of the type (see below).
-
 A list of supported types can be found in the cdist-reference(7) manpage.
 
 SINGLETON TYPES
@@ -111,7 +107,7 @@ __package_$type "$@"
 --------------------------------------------------------------------------------
 
 As you can see, the type can reference different environment variables,
-which are documented in cdist-environment-variables(7).
+which are documented in cdist-reference(7).
 
 Always ensure the manifest is executable, otherwise cdist will not be able
 to execute it.
diff --git a/doc/man/man7/cdist.text b/doc/man/man7/cdist.text
index 9f7dbbab..2a5d1fe5 100644
--- a/doc/man/man7/cdist.text
+++ b/doc/man/man7/cdist.text
@@ -35,12 +35,11 @@ pull mechanism (client requests configuration).
 SEE ALSO
 --------
 - Website: http://www.nico.schottelius.org/software/cdist/[]
-- cdist-best-practise(7)
-- cdist-deploy-to(1)
 - cdist-hacker(7)
 - cdist-manifest(7)
-- cdist-quickstart(1)
 - cdist-type(7)
+- cdist(1)
+- cdist(7)
 
 
 COPYING