diff --git a/TODO b/TODO
index dad8f96a1..08557d6b5 100644
--- a/TODO
+++ b/TODO
@@ -67,9 +67,5 @@
       +./kak -help commands > ../doc/commands.asciidoc+
       with README.asciidoc including commands ?
 
-* Rewrite keymap support using options ? (map window insert a b -> set -add window insert_keymap a:b)
-
 * Comments and strings should be more integrated than just highlighting, matching chars
   for example should be strings and comments aware (should they ?)
-
-* %val{opt_.*} == %opt{.*}, %val{reg_.*} == %reg{.*}, it might make sense to remove the %opt and %reg