diff --git a/TODO b/TODO
index dd85f57473..34070b9ff1 100644
--- a/TODO
+++ b/TODO
@@ -37,19 +37,17 @@ Before 220:
 * timer units triggering services with failing conditions run busy:
   http://lists.freedesktop.org/archives/systemd-devel/2015-April/030095.html
 
-* logind: follow PropertiesChanged state more closely, to deal with quick logouts and relogins
-
-* networkd: fix ip forwarding boolean
-
 * whe should apply a stop limit (similar to the existing start limit),
   so that we don't enter unbounded umount loops:
   http://lists.freedesktop.org/archives/systemd-devel/2015-April/030224.html
 
+Features:
+
+* logind: follow PropertiesChanged state more closely, to deal with quick logouts and relogins
+
 * change to KillMode=mixed by default
 
-* introduce argv0array=
-
-Features:
+* introduce argv0contains=
 
 * invent a better systemd-run scheme for naming scopes, that works with remoting
 
@@ -59,8 +57,6 @@ Features:
 
 * log accumulated resource usage after each service invocation
 
-* export unit name escaping calls
-
 * networkd: dhcp server: try to assign stable IP addresses based on client's MAC address
 
 * nspawn: a nice way to boot up without machine id set, so that it is set at boot automatically for supporting --ephemeral. Maybe hash the host machine id together with the machine name to generate the machine id for the container