diff --git a/.vimrc b/.vimrc
index d09d296..7b862d1 100644
--- a/.vimrc
+++ b/.vimrc
@@ -187,57 +187,12 @@ set splitright
 noremap <leader>s :Scratch<cr>
 let g:scratchBackupFile='$HOME/.vim/.scratch'
 
-" Tagbar
-nnoremap <silent> <leader>t :TagbarToggle<cr>
-let g:tagbar_autoclose=1
-let g:tagbar_autofocus=1
-let g:tagbar_compact=1
-
-" Command-T
-" nnoremap <silent> <leader>f :CommandT<cr>
-" let g:CommandTMatchWindowReverse=1
-
 " CtrlP
 let g:ctrlp_map = '<leader>p'
 let g:ctrlp_match_window='bottom,order:btt,min:1,max:20'
-let g:ctrlp_reuse_window='startify'
 let g:ctrlp_working_path_mode='ra'
 let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard']
 
-" Startify
-let g:startify_change_to_vcs_root = 1
-
-" Gist
-let g:gist_detect_filetype=1
-let g:gist_open_browser_after_post=1
-let g:gist_clip_command = 'pbcopy'
-
-" Gundo
-nnoremap <leader>u :GundoToggle<cr>
-let g:gundo_preview_bottom=1
-
-" vimwiki
-let g:vimwiki_list = [{'path': '~/Dropbox/vimwiki', 'syntax': 'markdown', 'ext': '.md'},
-    \                 {'path': '~/Dropbox/simplymeasured/vimwiki', 'syntax': 'markdown', 'ext': '.md'}]
-let g:vimwiki_global_ext = 0
-nmap <leader>vw <plug>VimwikiIndex
-nmap <leader>vwt <plug>VimwikiTabIndex
-nmap <leader>vws <plug>VimwikiUISelect
-nmap <leader>vwi <plug>VimwikiDiaryIndex
-nmap <leader>vw<leader>w <plug>VimwikiMakeDiaryNote
-nmap <leader>vw<leader>t <plug>VimwikiTabMakeDiaryNote
-nmap <leader>vw<leader>n :VimwikiDiaryNextDay<cr>
-nmap <leader>vw<leader>p :VimwikiDiaryPrevDay<cr>
-nmap <leader>vw<leader>i <plug>VimwikiDiaryGenerateLinks
-
-" Vimux
-" map <leader>vp :VimuxPromptCommand<cr>
-" map <leader>vl :VimuxRunLastCommand<cr>
-" map <leader>vq :VimuxCloseRunner<cr>
-
-" NERDCommenter
-let NERDSpaceDelims = 1
-
 " Powerline
 python from powerline.vim import setup as powerline_setup
 python powerline_setup()
@@ -248,20 +203,6 @@ set guioptions-=T
 set guifont=Consolas:h9:cANSI
 set mousehide
 
-" quickfix
-autocmd QuickFixCmdPost *grep* cwindow
-
-" populate the argument list with each of the files named in the quickfix list
-function! QuickfixFilenames()
-let buffer_numbers = {}
-for quickfix_item in getqflist()
-  let buffer_numbers[quickfix_item['bufnr']] =
-  bufname(quickfix_item['bufnr'])
-endfor
-return join(map(values(buffer_numbers), 'fnameescape(v:val)'))
-endfunction
-command! -nargs=0 -bar Qargs execute 'args' QuickfixFilenames()
-
 " Expand %% into the directory of the current file
 cnoremap <expr> %% getcmdtype() == ':' ? expand('%:h').'/' : '%%'  
 
@@ -281,16 +222,6 @@ if v:version >= 703
   " set relativenumber
   set undofile
   set undodir=$HOME/.vim_undo//
-
-  " omnicomplete
-  " set completeopt=longest,menuone
-  " inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<cr>"
-  " inoremap <expr> <C-n> pumvisible() ? '<C-n>' :
-  "       \ '<C-n><C-r>=pumvisible() ? "\<lt>Down>" : ""<cr>'
-  " highlight Pmenu ctermbg=grey ctermfg=black
-  " highlight PmenuSel ctermbg=magenta ctermfg=black
-
-  " set colorcolumn=81
 endif
 
 if filereadable(glob("~/.vimrc.local"))