diff --git a/README.md b/README.md
index 669cf73..2c9a467 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,8 @@ to rename and detach the fork, starting to work on this as a new plugin.
 ## Migrating from symbols-outline.nvim
 
 If you have existing setup opts for symbols-outline.nvim, you can convert it to
-be usable for outline.nvim using this script: [scripts/convert-symbols-outline-opts.lua](scripts/convert-symbols-outline-opts.lua).
+be usable for outline.nvim using this script:
+[scripts/convert-symbols-outline-opts.lua](scripts/convert-symbols-outline-opts.lua).
 
 
 ---
diff --git a/lua/outline/init.lua b/lua/outline/init.lua
index c91114a..a921480 100644
--- a/lua/outline/init.lua
+++ b/lua/outline/init.lua
@@ -368,61 +368,42 @@ local function setup_keymaps(bufnr)
   local map = function(...)
     utils.nmap(bufnr, ...)
   end
-  -- goto_location of symbol and focus that window
   map(cfg.o.keymaps.goto_location, function()
     M._goto_location(true)
   end)
-  -- goto_location of symbol but stay in outline
   map(cfg.o.keymaps.peek_location, function()
     M._goto_location(false)
   end)
-  -- Navigate to corresponding outline location for current code location
   map(cfg.o.keymaps.restore_location, M._map_follow_cursor)
-  -- Navigate to corresponding outline location for current code location
   map(cfg.o.keymaps.goto_and_close, M._goto_and_close)
-  -- Move down/up in outline and peek that location in code
   map(cfg.o.keymaps.down_and_jump, function()
     M._move_and_jump('down')
   end)
-  -- Move down/up in outline and peek that location in code
   map(cfg.o.keymaps.up_and_jump, function()
     M._move_and_jump('up')
   end)
-  -- hover symbol
   map(cfg.o.keymaps.hover_symbol, require('outline.hover').show_hover)
-  -- preview symbol
   map(cfg.o.keymaps.toggle_preview, require('outline.preview').toggle)
-  -- rename symbol
   map(cfg.o.keymaps.rename_symbol, require('outline.rename').rename)
-  -- code actions
   map(cfg.o.keymaps.code_actions, require('outline.code_action').show_code_actions)
-  -- show help
   map(cfg.o.keymaps.show_help, require('outline.docs').show_help)
-  -- close outline
   map(cfg.o.keymaps.close, function()
     M.view:close()
   end)
-  -- toggle fold selection
   map(cfg.o.keymaps.fold_toggle, M._toggle_fold)
-  -- fold selection
   map(cfg.o.keymaps.fold, function()
     M._set_folded(true)
   end)
-  -- unfold selection
   map(cfg.o.keymaps.unfold, function()
     M._set_folded(false)
   end)
-  -- toggle fold all
   map(cfg.o.keymaps.fold_toggle_all, M._toggle_all_fold)
-  -- fold all
   map(cfg.o.keymaps.fold_all, function()
     M._set_all_folded(true)
   end)
-  -- unfold all
   map(cfg.o.keymaps.unfold_all, function()
     M._set_all_folded(false)
   end)
-  -- fold reset
   map(cfg.o.keymaps.fold_reset, function()
     M._set_all_folded(nil)
   end)
diff --git a/lua/outline/parser.lua b/lua/outline/parser.lua
index 5396fdc..466e77d 100644
--- a/lua/outline/parser.lua
+++ b/lua/outline/parser.lua
@@ -3,7 +3,6 @@ local folding = require('outline.folding')
 local lsp_utils = require('outline.utils.lsp_utils')
 local symbols = require('outline.symbols')
 local t_utils = require('outline.utils.table')
-local ui = require('outline.ui')
 
 local M = {}
 
diff --git a/lua/outline/utils/lsp_utils.lua b/lua/outline/utils/lsp_utils.lua
index 7490851..ed800c4 100644
--- a/lua/outline/utils/lsp_utils.lua
+++ b/lua/outline/utils/lsp_utils.lua
@@ -1,10 +1,9 @@
 local config = require('outline.config')
-local tbl_utils = require('outline.utils.table')
 
 local M = {}
 
 function M.is_buf_attached_to_lsp(bufnr)
-  local clients = vim.lsp.buf_get_clients(bufnr or 0)
+  local clients = vim.lsp.get_active_clients({ bufnr = bufnr or 0 })
   return clients ~= nil and #clients > 0
 end