diff --git a/.gitmodules b/.gitmodules
index 63627ee..7b86fb1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -58,9 +58,6 @@
 [submodule "vim/bundle/tlib_vim"]
 	path = vim/bundle/tlib_vim
 	url = https://github.com/tomtom/tlib_vim.git
-[submodule "vim/bundle/goyo.vim"]
-	path = vim/bundle/goyo.vim
-	url = https://github.com/junegunn/goyo.vim.git
 [submodule "vim/bundle/tabular"]
 	path = vim/bundle/tabular
 	url = https://github.com/godlygeek/tabular
diff --git a/README.md b/README.md
index 19a1624..b9cc839 100644
--- a/README.md
+++ b/README.md
@@ -117,7 +117,6 @@ As usual, to have your system use `vimpager` in place of `less`, you'll need to
 | F4              | ALL  | Toggle source code syntax checking               |
 |                 |      |                                                  |
 | \`              | N    | Toggle gutter (left bar with line numbers etc.)  |
-| Backslash+\`    | N    | Toggle the **goyo** distraction-free UI          |
 | Backslash+?     | N    | Toggle the **vim** reference manual              |
 
 #### Spell Check ####
@@ -164,7 +163,6 @@ For a complete list of mappings specific to **darkcloud-vimconfig**, check the l
   * [vim-hug-neovim-rpc](https://github.com/roxma/vim-hug-neovim-rpc): A compatibility layer for neovim rpc client working on vim8
 * [editorconfig-vim](https://github.com/editorconfig/editorconfig-vim): EditorConfig plugin for Vim that auto-configures certain settings when a .editorconfig file is present
 * [FastFold](https://github.com/Konfekt/FastFold): Speed up Vim by updating folds only when called-for.
-* [goyo.vim](https://github.com/junegunn/goyo.vim): Distraction-free writing in Vim.
 * [incsearch.vim](https://github.com/haya14busa/incsearch.vim): Improved incremental searching for Vim.
 * [lightline.vim](https://github.com/itchyny/lightline.vim): A light and configurable statusline/tabline for Vim.
 * [MatchTagAlways](https://github.com/Valloric/MatchTagAlways): A Vim plugin that always highlights the enclosing html/xml tags.
diff --git a/vim/bundle/goyo.vim b/vim/bundle/goyo.vim
deleted file mode 160000
index a9c7283..0000000
--- a/vim/bundle/goyo.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a9c7283dce60ffcdec952384f6451ff42f8914f2
diff --git a/vim/config/keyboard.vim b/vim/config/keyboard.vim
index b800cfb..6863ef7 100644
--- a/vim/config/keyboard.vim
+++ b/vim/config/keyboard.vim
@@ -119,8 +119,6 @@
 "    <Ctrl-F4>                | (A) -> toggle syntax checking
 "    <Alt-F4>                 | (A) -> toggle syntax checking
 "
-"    <Leader>`                | (A) -> toggle goyo (distraction-free mode)
-"
 "  (gvim toggles)
 "    <Leader><F1>             | (A) -> toggle the menubar
 "    <Leader><F2>             | (A) -> toggle the toolbar
@@ -678,9 +676,6 @@
         nnoremap <silent><expr> <A-F4> ':call ToggleAle()<CR>'
         xnoremap <silent><expr> <A-F4> '<Esc>:call ToggleAle()<CR>gv'
         inoremap <silent><expr> <A-F4> '<C-O>:call ToggleAle()<CR>'
-
-        "toggle goyo
-        nnoremap <silent><expr> <Leader>` ':Goyo<CR>'
     "}
 
     "GVIM TOGGLES:{
diff --git a/vim/config/plugins/goyo.vim b/vim/config/plugins/goyo.vim
deleted file mode 100644
index 849ad9c..0000000
--- a/vim/config/plugins/goyo.vim
+++ /dev/null
@@ -1,8 +0,0 @@
-autocmd VimEnter,Filetype *
-    \ let g:goyo_width = &textwidth |
-    \ if (g:goyo_width == 0) |
-    \     let g:goyo_width = max(map(getline(1,'$'), 'len(v:val)')) |
-    \     if (g:goyo_width < 80) |
-    \         let g:goyo_width = 80 |
-    \     endif |
-    \ endif