diff --git a/IDEAS b/IDEAS
deleted file mode 100644
index 22e7d70d..00000000
--- a/IDEAS
+++ /dev/null
@@ -1,20 +0,0 @@
-Important stuff:
-- our I/O operates on raw fds. we should use fde_t's everywhere so that
-  lookups are less necessary and so that I/O is done using the virtual functors,
-  IOFuncRead and IOFuncWrite.
-- implement comm_get_io_direction(fde_t *) and use it to determine how to reschedule
-  I/O direction when needed.
-
-Some of this may not be possible to do in 2.3...
-
-- go TS6 only? [partially done; TS6 is always enabled now]
-- client.c, channel.c is very 2.8 style still. it'd be nice to pack them into their own namespace and 
-  such. moreover, the other 2.8 code needs similar rewriting/reworking too...
-- internally split out +o/+v "ranks" into a series of permissions. this could allow for configure-defined 
-  special access levels, halfops, etc. (would need to match globally, somehow. extra SVINFO param?)
-- somehow hide channel operators like ircnet can do?
-- SASL opering?
-- link failover?
-
---
-$Id: IDEAS 3552 2007-08-09 06:50:13Z nenolod $
diff --git a/TODO b/TODO
index e37f601d..606e4ad9 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,9 @@
-/ = in progress, x = done, ? = to be discussed
+/ = in progress, x = done, ? = to be discussed, F = for future releases
 
 [/] finish legacy code removal
   [x] remove 2.8 report_error() in ratbox imported stuff
+  [F] client.c, channel.c is very 2.8 style still. it'd be nice to pack them into their own 
+      namespace and such. moreover, the other 2.8 code needs similar rewriting/reworking too...
   [ ] rewrite s_auth.c -> split into three distinct parts
     [ ] authentication state/lock manager
     [ ] identd check
@@ -27,6 +29,9 @@
 [ ] module engine rework
   [ ] more beautiful way of adding new channel modes by module
 [ ] other stuff
+  [?] internally split out +o/+v "ranks" into a series of permissions. this could allow for configure-defined 
+      special access levels, halfops, etc. (would need to match globally, somehow. extra SVINFO param?)
+  [?] somehow hide channel operators like ircnet can do?
   [x] merge m_join.c and m_sjoin.c in one module (same functions, done in ratbox3)
   [ ] merge s_gline.c and m_gline.c in one module (for pretty look, done in ratbox3)
   [x] create chmode.h and put there all declarations of chm_* - this will make some modules clean