diff --git a/config/nvim/lua/config/comment.lua b/config/nvim/lua/config/comment.lua
deleted file mode 100644
index bd47faf..0000000
--- a/config/nvim/lua/config/comment.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("Comment").setup()
diff --git a/config/nvim/lua/config/indent-blankline.lua b/config/nvim/lua/config/indent-blankline.lua
index 0f54102..b8af1df 100644
--- a/config/nvim/lua/config/indent-blankline.lua
+++ b/config/nvim/lua/config/indent-blankline.lua
@@ -1,8 +1,8 @@
-require("indent_blankline").setup({
+require("indent_blankline").setup {
   space_char_blankline = " ",
   show_current_context = true,
   show_current_context_start = true,
   use_treesitter = true,
   use_treesitter_scope = true,
   char = "▎",
-})
+}
diff --git a/config/nvim/lua/config/treesitter.lua b/config/nvim/lua/config/treesitter.lua
index 76bf13e..b49b882 100644
--- a/config/nvim/lua/config/treesitter.lua
+++ b/config/nvim/lua/config/treesitter.lua
@@ -1,4 +1,4 @@
-require("nvim-treesitter.configs").setup({
+require("nvim-treesitter.configs").setup {
   rainbow = {
     enable = true,
     extended_mode = true,
@@ -22,10 +22,6 @@ require("nvim-treesitter.configs").setup({
       node_decremental = "<TAB>",
     },
   },
-})
--- Setup treesitter
-local ts = require("nvim-treesitter.configs")
-ts.setup({
   ensure_installed = {
     "c",
     "css",
@@ -41,5 +37,5 @@ ts.setup({
     "vim",
     "toml",
   },
-  highlight = { enable = true },
-})
+  highlight = { enable = true }
+}
diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua
index b982040..b80f976 100644
--- a/config/nvim/lua/plugins.lua
+++ b/config/nvim/lua/plugins.lua
@@ -13,10 +13,6 @@ return packer.startup({ function(use)
         'romgrk/barbar.nvim',
         requires = { 'kyazdani42/nvim-web-devicons' }, config = config("barbar")
     }
-    use {
-        "numToStr/Comment.nvim",
-        config = config("comment")
-    }
     use "xolox/vim-session"
 
     -- Theming
diff --git a/config/nvim/plugin/packer_compiled.lua b/config/nvim/plugin/packer_compiled.lua
index 881ea72..0f81c9b 100644
--- a/config/nvim/plugin/packer_compiled.lua
+++ b/config/nvim/plugin/packer_compiled.lua
@@ -74,12 +74,6 @@ end
 time([[try_loadstring definition]], false)
 time([[Defining packer_plugins]], true)
 _G.packer_plugins = {
-  ["Comment.nvim"] = {
-    config = { 'require "config.comment"' },
-    loaded = true,
-    path = "/home/quadradical/.local/share/nvim/site/pack/packer/start/Comment.nvim",
-    url = "https://github.com/numToStr/Comment.nvim"
-  },
   ["barbar.nvim"] = {
     config = { 'require "config.barbar"' },
     loaded = true,
@@ -187,6 +181,10 @@ time([[Defining packer_plugins]], false)
 time([[Config for nvim-tree.lua]], true)
 require "config.nvim-tree"
 time([[Config for nvim-tree.lua]], false)
+-- Config for: toggleterm.nvim
+time([[Config for toggleterm.nvim]], true)
+require "config.toggleterm"
+time([[Config for toggleterm.nvim]], false)
 -- Config for: nvim-treesitter
 time([[Config for nvim-treesitter]], true)
 require "config.treesitter"
@@ -195,10 +193,6 @@ time([[Config for nvim-treesitter]], false)
 time([[Config for indent-blankline.nvim]], true)
 require "config.indent-blankline"
 time([[Config for indent-blankline.nvim]], false)
--- Config for: Comment.nvim
-time([[Config for Comment.nvim]], true)
-require "config.comment"
-time([[Config for Comment.nvim]], false)
 -- Config for: lualine.nvim
 time([[Config for lualine.nvim]], true)
 require "config.lualine"
@@ -219,10 +213,6 @@ time([[Config for novim-mode]], false)
 time([[Config for coc.nvim]], true)
 require "config.coc"
 time([[Config for coc.nvim]], false)
--- Config for: toggleterm.nvim
-time([[Config for toggleterm.nvim]], true)
-require "config.toggleterm"
-time([[Config for toggleterm.nvim]], false)
 -- Config for: dashboard-nvim
 time([[Config for dashboard-nvim]], true)
 require "config.dashboard"