diff --git a/lua/avante/init.lua b/lua/avante/init.lua
index 6738d92..6130dbb 100644
--- a/lua/avante/init.lua
+++ b/lua/avante/init.lua
@@ -61,16 +61,21 @@ H.keymaps = function()
     M.toggle.hint()
   end)
 
-  Utils.safe_keymap_set({ "n", "v" }, Config.mappings.ask, "<Plug>(AvanteAsk)", { desc = "avante: ask" })
-  Utils.safe_keymap_set("v", Config.mappings.edit, "<Plug>(AvanteEdit)", { desc = "avante: edit" })
-  Utils.safe_keymap_set("n", Config.mappings.refresh, "<Plug>(AvanteRefresh)", { desc = "avante: refresh" })
-  Utils.safe_keymap_set(
-    "n",
-    Config.mappings.toggle.debug,
-    "<Plug>(AvanteToggleDebug)",
-    { desc = "avante: toggle debug" }
-  )
-  Utils.safe_keymap_set("n", Config.mappings.toggle.hint, "<Plug>(AvanteToggleHint)", { desc = "avante: toggle hint" })
+  Utils.safe_keymap_set({ "n", "v" }, Config.mappings.ask, function()
+    M.ask()
+  end, { desc = "avante: ask" })
+  Utils.safe_keymap_set("v", Config.mappings.edit, function()
+    M.edit()
+  end, { desc = "avante: edit" })
+  Utils.safe_keymap_set("n", Config.mappings.refresh, function()
+    M.refresh()
+  end, { desc = "avante: refresh" })
+  Utils.safe_keymap_set("n", Config.mappings.toggle.debug, function()
+    M.toggle.debug()
+  end, { desc = "avante: toggle debug" })
+  Utils.safe_keymap_set("n", Config.mappings.toggle.hint, function()
+    M.toggle.hint()
+  end, { desc = "avante: toggle hint" })
 end
 
 ---@class ApiCaller
diff --git a/lua/avante/utils/init.lua b/lua/avante/utils/init.lua
index f666798..707cf58 100644
--- a/lua/avante/utils/init.lua
+++ b/lua/avante/utils/init.lua
@@ -98,12 +98,6 @@ M.toggle_wrap = function(toggle)
   }) --[[@as ToggleBind.wrap]]
 end
 
----@param lhs string
----@param toggle ToggleBind
-M.toggle_map = function(lhs, toggle)
-  M.safe_keymap_set("n", lhs, M.toggle_wrap(toggle), { desc = "toggle(avante): " .. toggle.name })
-end
-
 -- Wrapper around vim.keymap.set that will
 -- not create a keymap if a lazy key handler exists.
 -- It will also set `silent` to true by default.