diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index a533680a6539..18116432d358 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -1114,7 +1114,6 @@ in
           -> all (dev: dev.preOpenCommands == "" && dev.postOpenCommands == "") (attrValues luks.devices);
         message = "boot.initrd.luks.devices.<name>.preOpenCommands and postOpenCommands is not supported by systemd stage 1. Please bind a service to cryptsetup.target or cryptsetup-pre.target instead.";
       }
-      # TODO
       {
         assertion = config.boot.initrd.systemd.enable -> !luks.gpgSupport;
         message = systemdStage1HardwareKeyAssertionMessage "boot.initrd.luks.gpgSupport";
@@ -1123,7 +1122,6 @@ in
         assertion = config.boot.initrd.systemd.enable -> !luks.fido2Support;
         message = systemdStage1HardwareKeyAssertionMessage "boot.initrd.luks.fido2Support";
       }
-      # TODO
       {
         assertion = config.boot.initrd.systemd.enable -> !luks.yubikeySupport;
         message = systemdStage1HardwareKeyAssertionMessage "boot.initrd.luks.yubikeySupport";
diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix
index a21d97a52be3..953f0a88904c 100644
--- a/nixos/modules/tasks/encrypted-devices.nix
+++ b/nixos/modules/tasks/encrypted-devices.nix
@@ -119,7 +119,6 @@ in
         );
         forceLuksSupportInInitrd = true;
       };
-      # TODO: systemd stage 1
       postMountCommands = lib.mkIf (!config.boot.initrd.systemd.enable) (
         concatMapStrings (
           dev: