diff --git a/lua/symbols-outline/code_action.lua b/lua/symbols-outline/code_action.lua
index c1c030a..36f8b69 100644
--- a/lua/symbols-outline/code_action.lua
+++ b/lua/symbols-outline/code_action.lua
@@ -1,7 +1,6 @@
 local vim = vim
 
 local main = require 'symbols-outline'
-local buf_request = require('symbols-outline.utils.lsp_utils').request
 
 local M = {}
 
@@ -24,8 +23,7 @@ function M.show_code_actions()
   local node = main.state.flattened_outline_items[current_line]
 
   local params = get_action_params(node, main.state.code_win)
-
-  buf_request(
+  vim.lsp.buf_request(
     params.bufnr,
     'textDocument/codeAction',
     params,
diff --git a/lua/symbols-outline/hover.lua b/lua/symbols-outline/hover.lua
index 92ca455..27f2a01 100644
--- a/lua/symbols-outline/hover.lua
+++ b/lua/symbols-outline/hover.lua
@@ -1,6 +1,5 @@
 local so = require 'symbols-outline'
 local util = vim.lsp.util
-local buf_request = require('symbols-outline.utils.lsp_utils').request
 
 local M = {}
 
@@ -22,10 +21,11 @@ function M.show_hover()
 
   local hover_params = get_hover_params(node, so.state.code_win)
 
-  buf_request(
+  vim.lsp.buf_request(
     hover_params.bufnr,
     'textDocument/hover',
     hover_params,
+---@diagnostic disable-next-line: param-type-mismatch
     function(_, result, _, config)
       if not (result and result.contents) then
         -- return { 'No information available' }
diff --git a/lua/symbols-outline/preview.lua b/lua/symbols-outline/preview.lua
index 42ee98a..95da7ec 100644
--- a/lua/symbols-outline/preview.lua
+++ b/lua/symbols-outline/preview.lua
@@ -1,7 +1,6 @@
 local vim = vim
 local main = require 'symbols-outline'
 local config = require 'symbols-outline.config'
-local buf_request = require('symbols-outline.utils.lsp_utils').request
 
 local M = {}
 
diff --git a/lua/symbols-outline/rename.lua b/lua/symbols-outline/rename.lua
index 0d5d4ef..b9d413d 100644
--- a/lua/symbols-outline/rename.lua
+++ b/lua/symbols-outline/rename.lua
@@ -1,5 +1,4 @@
 local so = require 'symbols-outline'
-local buf_request = require('symbols-outline.utils.lsp_utils').request
 
 local M = {}
 
@@ -27,7 +26,7 @@ function M.rename()
 
   params.newName = new_name
 
-  buf_request(
+  vim.lsp.buf_request(
     params.bufnr,
     'textDocument/rename',
     params,
diff --git a/lua/symbols-outline/utils/lsp_utils.lua b/lua/symbols-outline/utils/lsp_utils.lua
index f1f764b..a0fe87c 100644
--- a/lua/symbols-outline/utils/lsp_utils.lua
+++ b/lua/symbols-outline/utils/lsp_utils.lua
@@ -1,37 +1,5 @@
-local vim = vim
-
 local M = {}
 
--- callback args changed in Neovim 0.5.1/0.6. See:
--- https://github.com/neovim/neovim/pull/15504
-local function mk_handler(fn)
-  return function(...)
-    local config_or_client_id = select(4, ...)
-    local is_new = type(config_or_client_id) ~= 'number'
-    if is_new then
-      fn(...)
-    else
-      local err = select(1, ...)
-      local method = select(2, ...)
-      local result = select(3, ...)
-      local client_id = select(4, ...)
-      local bufnr = select(5, ...)
-      local config = select(6, ...)
-      fn(
-        err,
-        result,
-        { method = method, client_id = client_id, bufnr = bufnr },
-        config
-      )
-    end
-  end
-end
-
--- from mfussenegger/nvim-lsp-compl@29a81f3
-function M.request(bufnr, method, params, handler)
-  return vim.lsp.buf_request(bufnr, method, params, mk_handler(handler))
-end
-
 function M.is_buf_attached_to_lsp(bufnr)
   local clients = vim.lsp.buf_get_clients(bufnr or 0)
   return clients ~= nil and #clients > 0