diff --git a/vim/vimrc b/vim/vimrc
index c20b90d..19fe96f 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -16,17 +16,17 @@ set guioptions=aAce
 set mouse=a
 
 " Window manipulation
-map tt               <C-w>
+"map tt               <C-w>
 map <C-w><Backspace> <C-w><Left> | " This and the below are also useful for colemak
 map <C-w><Space>     <C-w><Right>
 
 " Surrounds shortcuts for visual selections
-vmap " s"
-vmap ' s'
-vmap ( s)
-vmap [ s]
-vmap { s}
-vmap < s>
+"vmap " s"
+"vmap ' s'
+"vmap ( s)
+"vmap [ s]
+"vmap { s}
+"vmap < s>
 
 " Pressing backspace with selection does something weird
 " thanks to above surrounds shortcuts so let's be specific
@@ -40,24 +40,11 @@ vmap <Backspace> xi
 "   and 'l' which are where 'y' and 'u' are in in QWERTY)
 nmap h <Up>
 nmap k <Down>
-nmap j <nop>
-nmap l <nop>
-
-" Quick save
-nmap <Leader>w :w!<CR>
 
 " Nicer split controls
 "map <C-_>  normal :split<CR>
 "map <C-\|> normal :vsplit<CR>
 
-imap ii <Esc>     | " 'i' for insert mode and 'ii' to get out of it!
-
-map nn <Leader>   | " This will probably have to be remapped (because nn is a fairly common combo)
-imap nn <Leader>  |
-
-map <Esc> <nop>   |
-imap <Esc> <nop>  |
-
 " Emacs-like keys for the command line
 cnoremap <C-A>      <Home>
 cnoremap <C-E>      <End>