diff --git a/nvim/after/ftplugin/haskell.vim b/nvim/after/ftplugin/haskell.vim
deleted file mode 100644
index bdabaed..0000000
--- a/nvim/after/ftplugin/haskell.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-let g:haskall_test = 1
-setlocal foldmethod<
-setlocal foldtext<
diff --git a/nvim/after/syntax/cabal.vim b/nvim/after/syntax/cabal.vim
deleted file mode 100644
index 8ced55f..0000000
--- a/nvim/after/syntax/cabal.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-setlocal foldmethod<
-setlocal foldtext<
diff --git a/nvim/after/syntax/cabalconfig.vim b/nvim/after/syntax/cabalconfig.vim
deleted file mode 100644
index 8ced55f..0000000
--- a/nvim/after/syntax/cabalconfig.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-setlocal foldmethod<
-setlocal foldtext<
diff --git a/nvim/after/syntax/nginx.vim b/nvim/after/syntax/nginx.vim
index 1e4e3af..fb06acc 100644
--- a/nvim/after/syntax/nginx.vim
+++ b/nvim/after/syntax/nginx.vim
@@ -4,5 +4,5 @@
 " sourced in `syntax/nginx.vim` in vim-polyglot, which resets the `commentstring`
 " set in `ftplugin/nginx.vim` and sets `comments` to some garbage. This script
 " undoes that damage.
-setlocal comments<
-setlocal commentstring=#%s
+let &l:comments = &g:comments
+let &l:commentstring = '#%s'