diff --git a/lua/core/mappings.lua b/lua/core/mappings.lua
index c71099d..3c01991 100644
--- a/lua/core/mappings.lua
+++ b/lua/core/mappings.lua
@@ -38,9 +38,6 @@ vim.keymap.set({"n", "x"}, "<leader>y", '"+y', opts)
 vim.keymap.set({"n", "x"}, "<leader>p", '"+p', opts)
 -- Allow exiting insert mode in terminal by hitting <ESC>
 vim.keymap.set("t", "<Esc>", "<C-\\><C-n>", opts)
--- Navigate forward/backwards
-vim.keymap.set("n", "<C-l>", "<C-i>", opts)
-vim.keymap.set("n", "<C-h>", "<C-o>", opts)
 -- Use :diffput/get instead of normal one to allow staging visual selection
 vim.keymap.set({"n", "x"}, "<leader>dp", "&diff ? ':diffput<CR>' : '<leader>dp'", opts_expr)
 vim.keymap.set({"n", "x"}, "<leader>do", "&diff ? ':diffget<CR>' : '<leader>do'", opts_expr)
diff --git a/lua/lsp/init.lua b/lua/lsp/init.lua
index c2536e6..f657953 100644
--- a/lua/lsp/init.lua
+++ b/lua/lsp/init.lua
@@ -173,21 +173,17 @@ function P.on_attach(client, bufnr)
     -- Mappings.
     -- See `:help vim.lsp.*` for documentation on any of the below functions
     local opts = { silent = true, buffer = bufnr, }
-    vim.keymap.set("n", "L", vim.diagnostic.open_float, opts)
+    vim.keymap.set("n", "<leader>df", vim.diagnostic.open_float, opts)
     vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, opts)
     vim.keymap.set("n", "]d", vim.diagnostic.goto_next, opts)
-    vim.keymap.set("n", "<leader>ll", vim.diagnostic.setloclist, opts)
+    vim.keymap.set("n", "<leader>dl", vim.diagnostic.setloclist, opts)
     vim.keymap.set("n", "gD", vim.lsp.buf.declaration, opts)
     vim.keymap.set("n", "gd", vim.lsp.buf.definition, opts)
     vim.keymap.set("n", "K", vim.lsp.buf.hover, opts)
     vim.keymap.set("n", "gi", vim.lsp.buf.implementation, opts)
-    vim.keymap.set("n", "<leader>s", vim.lsp.buf.signature_help, opts)
-    vim.keymap.set("n", "<leader>wa", vim.lsp.buf.add_workspace_folder, opts)
-    vim.keymap.set("n", "<leader>wr", vim.lsp.buf.remove_workspace_folder, opts)
-    vim.keymap.set("n", "<leader>wl", function () print(vim.inspect(vim.lsp.buf.list_workspace_folders())) end, opts)
-    -- vim.keymap.set("n", "gt", vim.lsp.buf.type_definition, opts)
-    vim.keymap.set("n", "<leader>rn", ca_rename, opts)
-    vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, opts)
+    vim.keymap.set("n", "<leader>ls", vim.lsp.buf.signature_help, opts)
+    vim.keymap.set("n", "<leader>lr", ca_rename, opts)
+    vim.keymap.set("n", "<leader>la", vim.lsp.buf.code_action, opts)
     vim.keymap.set("n", "gr", vim.lsp.buf.references, opts)
     vim.keymap.set(
         { "n", "x", },
diff --git a/lua/plugins/config/dap.lua b/lua/plugins/config/dap.lua
index 8c284e6..b9b6755 100644
--- a/lua/plugins/config/dap.lua
+++ b/lua/plugins/config/dap.lua
@@ -20,13 +20,6 @@ vim.fn.execute("nnoremap <silent> <F5> :lua require'dap'.continue()<CR>")
 vim.fn.execute("nnoremap <silent> <F10> :lua require'dap'.step_over()<CR>")
 vim.fn.execute("nnoremap <silent> <F11> :lua require'dap'.step_into()<CR>")
 vim.fn.execute("nnoremap <silent> <F12> :lua require'dap'.step_out()<CR>")
-vim.fn.execute("nnoremap <leader>dt :lua require'plugin.config.dap'.pytest({'-k', ''})<left><left><left>")
-vim.fn.execute("nnoremap <leader>dl :lua require'plugin.config.dap'.launch({''})<left><left><left>")
-vim.fn.execute("nnoremap <silent> <leader>db :lua require'dap'.toggle_breakpoint()<CR>")
--- vim.fn.execute("nnoremap <silent> <leader>B :lua require'dap'.set_breakpoint(vim.fn.input('Breakpoint condition: '))<CR>")
--- vim.fn.execute("nnoremap <silent> <leader>lp :lua require'dap'.set_breakpoint(nil, nil, vim.fn.input('Log point message: '))<CR>")
-vim.fn.execute("nnoremap <silent> <leader>dr :lua require'dap'.repl.open()<CR>")
--- vim.fn.execute("nnoremap <silent> <leader>dl :lua require'dap'.run_last()<CR>")
 
 local utils = require("utils")