diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua
index 191b63d..e7598d1 100644
--- a/lua/plugins/treesitter.lua
+++ b/lua/plugins/treesitter.lua
@@ -1,11 +1,6 @@
-local config = require('config')
-local u = require('utils')
-
-local defaults = {
+local config = {
   ensure_installed = {
-    'astro',
     'css',
-    'go',
     'html',
     'javascript',
     'jsdoc',
@@ -17,7 +12,7 @@ local defaults = {
     'python',
     'regex',
     'styled',
-    'scss',
+    'svelte',
     'tsx',
     'typescript',
     'yaml',
@@ -32,10 +27,6 @@ local defaults = {
   autotag = {
     enable = true,
   },
-  context_commentstring = {
-    enable = true,
-    enable_autocmd = false,
-  },
   refactor = {
     highlight_definitions = { enable = true },
     highlight_current_scope = { enable = false },
@@ -52,7 +43,9 @@ return {
   event = 'BufEnter',
   build = ':TSUpdate',
   config = function()
-    require('nvim-treesitter.configs').setup(u.merge(defaults, config.plugins.treesitter or {}))
+    require('nvim-treesitter.configs').setup(config)
+    require('ts_context_commentstring').setup {
+      enable_autocmd = false,
+    }
   end,
-  enabled = not vim.tbl_contains(config.disable_builtin_plugins, 'treesitter'),
 }