diff --git a/DEVELOP b/DEVELOP
index 4b4da831..6a0f6671 100644
--- a/DEVELOP
+++ b/DEVELOP
@@ -332,7 +332,7 @@ Which indicates that testcases/files/logs/mysqld.log has been moved or is a dire
 
   To generate a list of committers use e.g.
 
-  git shortlog -sn 0.8.11.. | sed -e 's,^[ 0-9\t]*,,g' | tr '\n' '\|' | sed -e 's:|:, :g'
+  git shortlog -sn 0.8.12.. | sed -e 's,^[ 0-9\t]*,,g' | tr '\n' '\|' | sed -e 's:|:, :g'
 
   Ensure the top of the ChangeLog has the right version and current date.
 
@@ -343,6 +343,8 @@ Which indicates that testcases/files/logs/mysqld.log has been moved or is a dire
   (cd man ; ./generate-man )
   git commit -m 'DOC/ENH: update man pages for release' man/*
 
+# Cleanout TODO file with the finished stuff
+
 # Prepare source and rpm binary distributions
 
   python setup.py sdist
diff --git a/TODO b/TODO
index 33263d3e..84e27491 100644
--- a/TODO
+++ b/TODO
@@ -13,20 +13,6 @@ Legend:
 # partially done
 * done
 
-- more detailed explaination in DEVELOP for new developers (eg. howto build this HEX numbers in ChangeLog)
-
-- Run tests though all filters/examples files - (see sshd example file) as unit
-  test
-
-* Removed relative imports
-
-* Cleanup fail2ban-client and fail2ban-server. Move code to server/ and client/
-
-- Add timeout to external commands (signal alarm, watchdog thread, etc)
-
-- Uniformize filters and actions name. Use the software name (openssh, postfix,
-  proftp) and possible qualifier (e.g. auth) after a '-'
-
 - Added <USER> tag for failregex. Add features using this information. Maybe add
   more tags
 
@@ -37,23 +23,13 @@ Legend:
 - Auto-enable function (search for log files), check modification date to see if
   service is still in use
 
-- Improve parsing of the action parameters in jailreader.py
-
 - Better handling of the protocol in transmitter.py
 
 - Add gettext support (I18N)
 
-- Multiline log reading
-
 - Improve execution of action. Why does subprocess.call deadlock with
   multi-jails?
 
-# see Feature Request Tracking System at SourceForge.net
-
 # improve documentation and website for user
 
 # better return values in function
-
-# refactoring in server.py, actions.py, filter.py
-
-* New backend: pyinotify