diff --git a/TODO b/TODO
index d91eb366fb..c948d89803 100644
--- a/TODO
+++ b/TODO
@@ -42,8 +42,6 @@ Features:
 
 * mount: turn dependency information from /proc/self/mountinfo into dependency information between systemd units.
 
-* udev: remove all (misguided from day 1) userspace firmware_class handling
-
 * logind: optionally, ignore idle-hint logic for autosuspend, block suspend as long as a session is around
 
 * service: when killing a service with SIGKILL always kill all processes, even if for SIGTERM we only killed the main process
@@ -104,8 +102,6 @@ Features:
 * hwdb:
   - implement conditional properties (dmi matches)
   - hwdb --filter=ID_DRIVE_*
-  - find out what to do for blockdevs and skipping scsi modaliases
-  - move writing code to src/libudev/libudev-hwdb-private.c
 
 * if booted in "quiet" mode, and an error happens, turn on status output again, so that the emergency mode isn't totally surprising
 
@@ -385,8 +381,6 @@ Features:
 
 * don't delete /tmp/systemd-namespace-* before a process is gone down
 
-* vconsole: implement setterm -store -foreground xxx --background zzz
-
 * ExecOnFailure=/usr/bin/foo
 
 * fedora: make sshd and pam_loginuid work in nspawn containers
@@ -397,16 +391,16 @@ Features:
 
 * ConditionSecurity= should learn about IMA and SMACK
 
-* udev: move to LGPL
+* udev:
+  - remove all (misguided from day 1) userspace firmware_class handling
+  - move to LGPL
+  - unify utf8 validator code with shared/
+  - kill scsi_id
+  - add trigger --subsystem-match=usb/usb_device device
 
-* udev systemd unify:
-  - utf8 validator code
-
-* udev: scsi_id -> sg3_utils -> kill scsi_id
-
-* udev: add trigger --subsystem-match=usb/usb_device device
-
-* allow configuration of console width/height in vconsole.conf
+* vconsole:
+  - implement setterm -store -foreground xxx --background zzz
+  - allow configuration of console width/height in vconsole.conf
 
 * cleanup syslog 'priority' vs. 'level' wording
 
@@ -436,7 +430,7 @@ Features:
 
 * figure out whether we should leave dbus around during shutdown
 
-* dbus: in fedora, make the machine a symlink to /etc/machine-id
+* dbus: in fedora, make /var/lib/dbus/machine-id a symlink to /etc/machine-id
 
 * dbus: move dbus to early boot