diff --git a/TODO b/TODO
index 0d35eb107..93096eaf8 100644
--- a/TODO
+++ b/TODO
@@ -1,11 +1,8 @@
-- Roster manipulation support
-- Private XML
 - On-the-fly code updates
-- S2S \o/
 - Control/statistics interface
 - External components
-
-Further down the line:
 - Ad-hoc commands
 - Clustering
 - Pubsub/PEP
+
+