diff --git a/nvim/.config/nvim/after/ftplugin/git.vim b/nvim/.config/nvim/after/ftplugin/git.vim
index 5bccc09..0d775b0 100644
--- a/nvim/.config/nvim/after/ftplugin/git.vim
+++ b/nvim/.config/nvim/after/ftplugin/git.vim
@@ -1,6 +1,3 @@
-" Disable whitespace highlighting in git buffer
-autocmd! BufEnter <buffer> DisableWhitespace
-
 nnoremap <buffer> <silent>q  :bwipeout!<CR>
 
 nnoremap <buffer> <Leader>gb :call git#git_branch_checkout()<CR>
diff --git a/nvim/.config/nvim/after/ftplugin/mail.vim b/nvim/.config/nvim/after/ftplugin/mail.vim
deleted file mode 100644
index 8125ebb..0000000
--- a/nvim/.config/nvim/after/ftplugin/mail.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-" Disable whitespace highlighting in mail buffer
-autocmd! BufEnter <buffer> DisableWhitespace
diff --git a/nvim/.config/nvim/after/plugin/better-whitespace.lua b/nvim/.config/nvim/after/plugin/better-whitespace.lua
deleted file mode 100644
index 0663608..0000000
--- a/nvim/.config/nvim/after/plugin/better-whitespace.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-vim.g.better_whitespace_enabled  = 1
-vim.g.strip_whitespace_on_save   = 1
-vim.g.better_whitespace_operator = ''
-vim.g.strip_whitespace_confirm   = 0
diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua
index e8f7839..0df6b22 100644
--- a/nvim/.config/nvim/lua/plugins.lua
+++ b/nvim/.config/nvim/lua/plugins.lua
@@ -14,8 +14,6 @@ local init = function ()
   use 'junegunn/fzf.vim'
   use 'wincent/ferret'
   use 'bronson/vim-visual-star-search'
-  -- Remove extraneous whitespace when edit mode is exited
-  use 'ntpeters/vim-better-whitespace'
   -- Manage Project sessions
   use 'thaerkh/vim-workspace'
   -- For autocompletion