diff --git a/shellrc b/shellrc
index 1794c14..dc5209b 100644
--- a/shellrc
+++ b/shellrc
@@ -11,6 +11,7 @@ if is_zsh; then
 	export HOSTNAME=${HOST}
 else
 	is_exec() [[ -x $(type -P ${1}) ]]
+	alias whence='type -P'
 fi
 
 newline="
@@ -200,9 +201,6 @@ if is_zsh; then
 	SAVEHIST=1000
 	HISTSIZE=1000
 	HISTFILE="${HOME}/.histfile"
-	#if [[ -z ${TMUX} && -z ${SSH_CLIENT} && ( ${TERM} == rxvt-unicode-* || ${TERM} == xterm-* ) ]]; then
-	#	gruvbox-colors
-	#fi
 
 	extras=( "${HOME}/.zshrc.extras" )
 
diff --git a/vimrc b/vimrc
index 9dd5776..4668d56 100644
--- a/vimrc
+++ b/vimrc
@@ -97,17 +97,6 @@ if v:version >= 700
 		Plugin 'tpope/vim-fugitive'              "git awesomeness
 		Plugin 'tpope/vim-surround'              "quotes replacement made easy
 		Plugin 'directionalWindowResizer'        "resize windows with simple hotkeys
-		"Plugin 'scrooloose/nerdcommenter'        "comment manager
-		"Plugin 'tpope/vim-tbone'                 "tmux support
-		"Plugin 'kien/ctrlp.vim'                  "some quick file accessing goodness
-		"Plugin 'vimacs'                          "it's emacs, in vim insert mode
-
-		" IDE like features
-		"Plugin 'jiangmiao/auto-pairs'            "automatically place closing bracket / quote
-		"Plugin 'majutsushi/tagbar'               "class / module browser
-		"Plugin 'msanders/snipmate.vim'           "snippets support
-		"Plugin 'xolox/vim-misc'                  "deps for lua-ftplugin
-		"Plugin 'xolox/vim-lua-ftplugin'          "lua stuff (very slow)
 
 		" colorschemes
 		Plugin 'morhetz/gruvbox'
@@ -120,9 +109,6 @@ if v:version >= 700
 		Plugin 'nagios-syntax'
 		silent! call vundle#end()
 
-		" auto-pairs options
-		"let g:AutoPairsShortcutToggle='<Leader>p'
-
 		" easymotion options
 		let g:EasyMotion_do_mapping=0
 		let g:EasyMotion_smartcase=1