.ideavimrc

@@ -48,8 +48,6 @@ sethandler <C-\> a:ide
 
 sethandler <A-B> a:vim
 sethandler <A-H> a:vim
-sethandler <A-J> a:vim
-sethandler <A-K> a:vim
 sethandler <A-L> a:vim
 sethandler <A-N> a:vim
 sethandler <A-O> a:vim
@@ -67,11 +65,6 @@ sethandler <C-S-W> a:vim
 sethandler <C-U> a:vim
 sethandler <S-BS> a:vim
 
-sethandler <C-Left> a:vim
-sethandler <C-Right> a:vim
-sethandler <S-Left> a:vim
-sethandler <S-Right> a:vim
-
 " Enable plugins (https://github.com/JetBrains/ideavim/wiki/IdeaVim-Plugins)
 Plug 'argtextobj.vim'
 Plug 'vim-exchange'
@@ -127,8 +120,6 @@ nnoremap d( c[((<Esc>l
 nnoremap <A-o> o<Esc>$
 nnoremap <A-S-o> O<Esc>$
 
-nnoremap g<CR> i<CR><Esc>l
-
 " Delete lines
 nnoremap C cc
 xnoremap C cc
@@ -176,13 +167,6 @@ map ] <Action>(MethodDown)
 map { <Plug>(ParagraphPrevMotion)$
 map } <Plug>(ParagraphNextMotion)$
 
-" Multiple carets
-map <A-j> <Action>(EditorCloneCaretBelow)
-map <A-k> <Action>(EditorCloneCaretAbove)
-
-imap <A-j> <Action>(EditorCloneCaretBelow)
-imap <A-k> <Action>(EditorCloneCaretAbove)
-
 " Manage editor tabs
 map <C-w>m <Action>(MoveEditorToOppositeTabGroup)
 map <C-w>s <Action>(MoveTabDown)
@@ -219,6 +203,8 @@ map ge <Action>(VcsShowNextChangeMarker)
 map gE <Action>(VcsShowPrevChangeMarker)
 map gf <Action>(VimJumpToSource)<Action>(HideActiveWindow)
 map gi <Action>(GotoImplementation)
+map gj <Action>(EditorCloneCaretBelow)
+map gk <Action>(EditorCloneCaretAbove)
 map gr <Action>(RecentLocations)
 map gR <Action>(RecentChangedFiles)
 map gs <Action>(GotoSuperMethod)

.vimrc

@@ -95,11 +95,6 @@ xnoremap <expr> j v:count ? 'j' : 'gj'
 nnoremap <expr> k v:count ? 'k' : 'gk'
 xnoremap <expr> k v:count ? 'k' : 'gk'
 
-nnoremap gj j
-xnoremap gj j
-nnoremap gk k
-xnoremap gk k
-
 " Edit from cursor to start/end of parenthesized block
 nnoremap c) c])
 nnoremap d) d])
@@ -110,8 +105,6 @@ nnoremap d( c[((<Esc>l
 nnoremap <M-o> o<Esc>$
 nnoremap <M-S-o> O<Esc>$ " TODO does not leave insert mode properly?
 
-nnoremap g<CR> i<CR><Esc>l
-
 " Delete lines
 nnoremap C cc
 xnoremap C cc