diff --git a/templates/nvim/init.lua.j2 b/templates/nvim/init.lua.j2
index 925dfed..b4553ac 100644
--- a/templates/nvim/init.lua.j2
+++ b/templates/nvim/init.lua.j2
@@ -1,4 +1,3 @@
---vim:set ts=2 sw=2 et:
 -- {{ ansible_managed }} {{ ansible_date_time.time }} {{ ansible_date_time.date }}
 
 require('options')
diff --git a/templates/nvim/lua/auto-commands.lua.j2 b/templates/nvim/lua/auto-commands.lua.j2
index 4c22a00..d4310aa 100644
--- a/templates/nvim/lua/auto-commands.lua.j2
+++ b/templates/nvim/lua/auto-commands.lua.j2
@@ -11,30 +11,6 @@ vim.api.nvim_create_autocmd('Syntax', {
     desc = 'Open folds by default',
 })
 
---color trailing spaces with red color
-vim.cmd('highlight ExtraWhitespace ctermbg=green guibg=green')
-vim.cmd('match ExtraWhitespace /s+$/')
-
-vim.api.nvim_create_autocmd('BufWinEnter', {
-    pattern = "*",
-    command = [[:match ExtraWhitespace /s+$/]],
-})
-
-vim.api.nvim_create_autocmd('InsertEnter', {
-    pattern = "*",
-    command = [[:match ExtraWhitespace /s+%#@<!$/]],
-})
-
-vim.api.nvim_create_autocmd('InsertLeave', {
-    pattern = "*",
-    command = [[:match ExtraWhitespace /s+$/]],
-})
-
-vim.api.nvim_create_autocmd('BufWinLeave', {
-    pattern = "*",
-    command = [[:call clearmatches()]],
-})
-
 vim.api.nvim_create_autocmd('Filetype', {
     pattern = 'TelescopeResults',
     command = [[:setlocal nofoldenable]],
diff --git a/templates/nvim/lua/options.lua.j2 b/templates/nvim/lua/options.lua.j2
index 4a1a279..0953733 100644
--- a/templates/nvim/lua/options.lua.j2
+++ b/templates/nvim/lua/options.lua.j2
@@ -49,6 +49,7 @@ vim.o.lbr = true
 --default Colors for CursorLine
 vim.o.cursorline = true
 
+-- theme related
 vim.o.termguicolors = true
 vim.o.background = 'light'