diff --git a/configuration.nix b/configuration.nix
index 2602a811..958311b1 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -92,7 +92,6 @@ isMaximal: {
       ruby.enable = false;
       fsharp.enable = false;
       just.enable = false;
-      make.enable = false;
       qml.enable = false;
       jinja.enable = false;
       tailwind.enable = false;
diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md
index 651f9f4e..662f7aeb 100644
--- a/docs/manual/release-notes/rl-0.9.md
+++ b/docs/manual/release-notes/rl-0.9.md
@@ -172,17 +172,10 @@
 
 - Added [`golangci-lint`](https://golangci-lint.run/) for more diagnostics.
 
-- Added Makefile support via `languages.make`.
-
 [vagahbond](https://github.com/vagahbond): [codewindow.nvim]:
 https://github.com/gorbit99/codewindow.nvim
 
 - Add [codewindow.nvim] plugin in `vim.assistant.codewindow` with `enable` and
   `setupOpts`
 
-[irobot](https://github.com/irobot):
-
-- Fix non-functional `vim.keymaps.*.noremap`. Now, setting it to false is
-  equivalent to `:lua vim.keymap.set(..., { remap = true })`
-
 <!-- vim: set textwidth=80: -->
diff --git a/modules/plugins/languages/default.nix b/modules/plugins/languages/default.nix
index 0986e1e1..7cc5bda5 100644
--- a/modules/plugins/languages/default.nix
+++ b/modules/plugins/languages/default.nix
@@ -52,7 +52,6 @@ in {
     ./yaml.nix
     ./ruby.nix
     ./just.nix
-    ./make.nix
     ./xml.nix
 
     # This is now a hard deprecation.
diff --git a/modules/plugins/languages/make.nix b/modules/plugins/languages/make.nix
deleted file mode 100644
index f7780cd9..00000000
--- a/modules/plugins/languages/make.nix
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  inherit (builtins) attrNames;
-  inherit (lib.options) mkEnableOption mkOption;
-  inherit (lib.meta) getExe;
-  inherit (lib.types) listOf enum;
-  inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.nvim.types) mkGrammarOption diagnostics;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
-
-  cfg = config.vim.languages.make;
-
-  defaultFormat = ["bake"];
-  formats = {
-    bake = {
-      command = "${pkgs.mbake}/bin/mbake";
-    };
-  };
-
-  defaultDiagnosticsProvider = ["checkmake"];
-  diagnosticsProviders = {
-    checkmake = {
-      config = {
-        cmd = getExe pkgs.checkmake;
-      };
-    };
-  };
-in {
-  options.vim.languages.make = {
-    enable = mkEnableOption "Make support";
-
-    treesitter = {
-      enable = mkEnableOption "Make treesitter" // {default = config.vim.languages.enableTreesitter;};
-      package = mkGrammarOption pkgs "make";
-    };
-
-    format = {
-      enable = mkEnableOption "Make formatting" // {default = config.vim.languages.enableFormat;};
-      type = mkOption {
-        description = "make formatter to use";
-        type = listOf (enum (attrNames formats));
-        default = defaultFormat;
-      };
-    };
-
-    extraDiagnostics = {
-      enable = mkEnableOption "extra Make diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;};
-      types = diagnostics {
-        langDesc = "Make";
-        inherit diagnosticsProviders;
-        inherit defaultDiagnosticsProvider;
-      };
-    };
-  };
-
-  config = mkIf cfg.enable (mkMerge [
-    (mkIf cfg.treesitter.enable {
-      vim.treesitter = {
-        enable = true;
-        grammars = [cfg.treesitter.package];
-      };
-    })
-
-    (mkIf cfg.format.enable {
-      vim.formatter.conform-nvim = {
-        enable = true;
-        setupOpts = {
-          formatters_by_ft.make = cfg.format.type;
-          formatters =
-            mapListToAttrs (name: {
-              inherit name;
-              value = formats.${name};
-            })
-            cfg.format.type;
-        };
-      };
-    })
-
-    (mkIf cfg.extraDiagnostics.enable {
-      vim.diagnostics.nvim-lint = {
-        enable = true;
-        linters_by_ft.make = cfg.extraDiagnostics.types;
-        linters =
-          mkMerge (map (name: {${name} = diagnosticsProviders.${name}.config;})
-            cfg.extraDiagnostics.types);
-      };
-    })
-  ]);
-}
diff --git a/modules/wrapper/rc/config.nix b/modules/wrapper/rc/config.nix
index 50211d2e..77a62d58 100644
--- a/modules/wrapper/rc/config.nix
+++ b/modules/wrapper/rc/config.nix
@@ -39,7 +39,6 @@ in {
 
     getOpts = keymap: {
       inherit (keymap) desc silent nowait script expr unique noremap;
-      remap = !keymap.noremap;
     };
 
     toLuaKeymap = bind: "vim.keymap.set(${toLuaObject bind.mode}, ${toLuaObject bind.key}, ${toLuaObject (getAction bind)}, ${toLuaObject (getOpts bind)})";