diff --git a/TODO b/TODO
index e8dc16c863..fe5d2f5882 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,4 @@
 Bugfixes:
-* check :no-sender logic after PID conversion
-
 * enabling an instance unit creates a pointless link, and
   the unit will be started with getty@getty.service:
     $ systemctl enable getty@.service
@@ -35,8 +33,6 @@ Fedora 20:
 
 CGroup Rework Completion:
 
-* introduce "mainpid" for scopes (or maybe not?)
-
 * implement system-wide DefaultCPUAccounting=1 switch (and similar for blockio, memory?)
 
 * implement per-slice CPUFairScheduling=1 switch
@@ -47,6 +43,8 @@ CGroup Rework Completion:
 
 Features:
 
+* check :no-sender logic after PID 1 conversion
+
 * increase journal files by a few MB each time, instead of piecemeal
 
 * add field to transient units that indicate whether systemd or somebody else saves/restores its settings, for integration with libvirt
diff --git a/src/libsystemd-bus/bus-internal.c b/src/libsystemd-bus/bus-internal.c
index f0a28c623c..3fb1cf40f3 100644
--- a/src/libsystemd-bus/bus-internal.c
+++ b/src/libsystemd-bus/bus-internal.c
@@ -170,6 +170,7 @@ bool sender_name_is_valid(const char *p) {
         if (isempty(p))
                 return false;
 
+        /* FIXME: remove after PID 1 bus conversion */
         if (streq(p, ":no-sender"))
                 return true;