diff --git a/TODO b/TODO
index fd9838bb..6605020f 100644
--- a/TODO
+++ b/TODO
@@ -1,12 +1,3 @@
-Guidelines for the API:
-o symmetrical, client side should be mirrored in the server
-o clean, small API
-o api-use should be self documenting
-o zone structure -- only as rb-tree 
-o fast data structures (rb-tree, when they come available)
-
-o build simple: just query function, built on the cool stuff
-o Key2DS, also for offline keys -- need to parse them ofcourse
 
 o Tsig will probably become an interface which has all configuration
   stuff, but this will come later. Config which has Tsig function
@@ -20,11 +11,11 @@ Todo:
 
 Issues:
 * FunkenSturm is kaput.
+* Check closing of sockets d.Close()
 * Check the network order, it works now, but this is on Intel??
 * Make the testsuite work with public DNS servers
 * pack/Unpack smaller. EDNS 'n stuff can be folded in
-* Config from /etc/resolv.conf
-* d.Dial() and redialing those that work
+* Compression. Take stuff from Jan Mercl
 
 Examples:
 * Test impl of nameserver, with a small zone, 1 KSK and online  signing