diff --git a/CHANGES b/CHANGES
index 8f36003..fc239c4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,13 +1,2 @@
-User visible changes in Apache Rivet:
 
 $Id$
-
-Changes for 0.4
----------------
-
-* New Apache 2.0 license.
-
-* DIO and DIODisplay docs.
-
-* Virtual Host modifications.  Rivet should interact better with
-  virtual hosts.
\ No newline at end of file
diff --git a/ChangeLog b/ChangeLog
index a7ab905..c3e1a32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2012-07-03 Massimo Manghi <mxmanghi@apache.org>
+    * CHANGES,TODO: emptied by obsolete content
+
 2012-06-06 Massimo Manghi <mxmanghi@apache.org>
     * INSTALL: wrong link to website fixed. Formatting improved by replacing tabs with spaces.
 
diff --git a/TODO b/TODO
index 2a46320..e69de29 100644
--- a/TODO
+++ b/TODO
@@ -1,75 +0,0 @@
-BUGS
-====
-
-TODO
-====
-
-* Apache 2 interface.
-
-* getting the plain post data. I use mod_dtcl as an xml server and I
-  need to collect the broken xml (due to query string proccessing). if
-  the user enters in the xml "=" I am lost. (From yahalom emet).
-
-* session handling. this feature can not be added by a tcl package so
-  it is missing from the interface.  (From yahalom emet).
-
-* Write commands like 'open' and such in the request namespace that
-  keep track of open file pointers and close them in the cleanup.
-
-* Complete the NWS package.
-
-* Swipe include_* from NWS and rework it like: include ?-virtual?
-  ?-noparse? file
-
-* Re-write load_file.  This basically loads an entire .tcl file into
-  the current document instead of sourcing it.  This will allow us to
-  cache even pages which only source a huge .tcl file.  load_virtual
-  should do the same but relative to the document root.
-
-* Create escape_string and unescape_string using Apache conventions.
-
-* Free Rivet commands of apache dependencies, which are moved into the
-  TclWebapache.c file.  Compatible file, for CGI only operating,
-  TclWebcgi.c needs to be created.
-
-* Create replacements, in Tcl where possible, for Rivet commands in
-  order to enable the aforementioned 'CGI' mode of operation.
-
-* Need to add a local.tcl for local procs and setup.
-
-* Script timeouts - limit time scripts can run before bailing out.
-
-* Safe mode.
-
-* Add documentation for commands implemented in Tcl.
-
-* Make some tests for commands implemented in Tcl.
-
-* Integrate package documentation with main documentation.
-
-* Document the 'form' package.
-
-* Integrate ncgi package, to help migration for people using it.
-
-* I think we need some kind of unified interface to launching tcl
-  'services'.  These are separate Tcl processes that most likely exist
-  to allow the Apache children to share data.
-
-* Find a way of integrating the Tcl event loop?
-
-* Document and add tests for parserivetdata command.
-
-MAYBE
-=====
-
-* Maybe move ::request commands into a file called request.tcl.
-
-
-DONE
-====
-
-* Nice logo.
-
-* Documentation in XML.
-
-* var_get and var_post commands.