diff --git a/laptop/init.lua b/laptop/init.lua
index 5ac96ac..9fb9328 100644
--- a/laptop/init.lua
+++ b/laptop/init.lua
@@ -4,7 +4,7 @@ package.path = package.path .. ';' .. vim.fn.stdpath("config") .. "/?.lua"
 -- Load global configs
 require("globals")
 -- Load plugins using paq-nvim
-require("paq")
+require("plugins")
 -- Load keymaps
 require("keymaps")
 
diff --git a/laptop/paq.lua b/laptop/plugins.lua
similarity index 97%
rename from laptop/paq.lua
rename to laptop/plugins.lua
index 50bc61d..a413ee5 100644
--- a/laptop/paq.lua
+++ b/laptop/plugins.lua
@@ -44,7 +44,6 @@ bootstrap_paq {
     "hrsh7th/cmp-omni",        -- For LaTeX completion
     "hrsh7th/cmp-path",
     "hrsh7th/cmp-cmdline",
-    "SirVer/ultisnips",        -- For snippets
     -- Support programming terms
     { "psliwka/vim-dirtytalk", build = ':let &rtp = &rtp | DirtytalkUpdate' },
     -- vim-moonfly theme
@@ -62,3 +61,4 @@ bootstrap_paq {
     "junegunn/fzf.vim",
     "kylechui/nvim-surround",
 }
+
diff --git a/server/init.lua b/server/init.lua
index 5ac96ac..9fb9328 100644
--- a/server/init.lua
+++ b/server/init.lua
@@ -4,7 +4,7 @@ package.path = package.path .. ';' .. vim.fn.stdpath("config") .. "/?.lua"
 -- Load global configs
 require("globals")
 -- Load plugins using paq-nvim
-require("paq")
+require("plugins")
 -- Load keymaps
 require("keymaps")
 
diff --git a/server/paq.lua b/server/plugins.lua
similarity index 100%
rename from server/paq.lua
rename to server/plugins.lua
diff --git a/vps/globals.lua b/vps/globals.lua
index c9294ca..e8d237c 100644
--- a/vps/globals.lua
+++ b/vps/globals.lua
@@ -27,11 +27,3 @@ vim.g.loaded_perl_provider = 0
 vim.g.loaded_node_provider = 0
 vim.g.loaded_ruby_provider = 0
 
--- Load keymaps
-local keymaps = vim.fn.stdpath("config") .. "/keymaps.lua"
-vim.cmd.source(keymaps)
-
--- Load plugins using paq-nvim
-local paq = vim.fn.stdpath("config") .. "/paq.lua"
-vim.cmd.source(paq)
-
diff --git a/vps/init.lua b/vps/init.lua
index 5ac96ac..9fb9328 100644
--- a/vps/init.lua
+++ b/vps/init.lua
@@ -4,7 +4,7 @@ package.path = package.path .. ';' .. vim.fn.stdpath("config") .. "/?.lua"
 -- Load global configs
 require("globals")
 -- Load plugins using paq-nvim
-require("paq")
+require("plugins")
 -- Load keymaps
 require("keymaps")
 
diff --git a/vps/paq.lua b/vps/plugins.lua
similarity index 82%
rename from vps/paq.lua
rename to vps/plugins.lua
index e349cfb..840bf3d 100644
--- a/vps/paq.lua
+++ b/vps/plugins.lua
@@ -33,16 +33,6 @@ bootstrap_paq {
     "lambdalisue/suda.vim",
     -- Auto toggle for number mode when vim isn't focused
     "sitiom/nvim-numbertoggle",
-    -- LSP related plugins
-    "neovim/nvim-lspconfig",
-    "nvim-lua/plenary.nvim",
-    "hrsh7th/nvim-cmp",        -- For LSP completion
-    "hrsh7th/cmp-nvim-lsp",
-    "hrsh7th/cmp-buffer",
-    "hrsh7th/cmp-vsnip",       -- For snippets
-    "hrsh7th/vim-vsnip",       -- For snippets
-    "hrsh7th/cmp-path",
-    "hrsh7th/cmp-cmdline",
     -- Support programming terms
     { "psliwka/vim-dirtytalk", build = ':let &rtp = &rtp | DirtytalkUpdate' },
     -- vim-moonfly theme