diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index d745cb78..fa24d0c9 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -445,12 +445,9 @@
 - Restore vim-dirtytalk plugin and fix ordering with spellcheck in generated config.
 - Fix lualine separator options
 - Add [neogit], an interactive and powerful Git interface for Neovim, inspired by Magit
-- Allow deregistering which-key binds or groups by setting them to `null`
-
 [justDeeevin](https://github.com/justDeeevin):
 
 [supermaven-nvim]: https://github.com/supermaven-inc/supermaven-nvim
 
 - Add [supermaven-nvim] plugin in `vim.assistant.supermaven-nvim` with `enable` and
   `setupOpts`
-
diff --git a/modules/plugins/assistant/supermaven-nvim/supermaven-nvim.nix b/modules/plugins/assistant/supermaven-nvim/supermaven-nvim.nix
index 80a27e47..4f1acb66 100644
--- a/modules/plugins/assistant/supermaven-nvim/supermaven-nvim.nix
+++ b/modules/plugins/assistant/supermaven-nvim/supermaven-nvim.nix
@@ -9,12 +9,11 @@
     enum
     ;
   inherit (lib.options) mkOption mkEnableOption;
-  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.assistant.supermaven-nvim = {
     enable = mkEnableOption "Supermaven AI assistant";
 
-    setupOpts = mkPluginSetupOption "Supermaven" {
+    setupOpts = lib.nvim.mkPluginSetupOption "Supermaven" {
       keymaps = {
         accept_suggestion = mkOption {
           type = nullOr str;
diff --git a/modules/plugins/utility/binds/which-key/config.nix b/modules/plugins/utility/binds/which-key/config.nix
index 625a6215..68dbbfbf 100644
--- a/modules/plugins/utility/binds/which-key/config.nix
+++ b/modules/plugins/utility/binds/which-key/config.nix
@@ -10,7 +10,7 @@
   inherit (lib.nvim.dag) entryAnywhere;
 
   cfg = config.vim.binds.whichKey;
-  register = mapAttrsToList (n: v: lib.lists.optional (! isNull v) (mkLuaInline "{ '${n}', desc = '${v}' }")) cfg.register;
+  register = mapAttrsToList (n: v: mkLuaInline "{ '${n}', desc = '${v}' }") cfg.register;
 in {
   config = mkIf cfg.enable {
     vim = {