diff --git a/tmux.conf b/tmux.conf
index d2ca1e2..bd61bf8 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -39,18 +39,14 @@ unbind %
 unbind '"'
 bind + split-window -h # horizontal split
 bind - split-window -v # vertical split
-bind -n C-h run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-h) || tmux select-pane -L"
-bind -n C-j run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-j) || tmux select-pane -D"
-bind -n C-k run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-k) || tmux select-pane -U"
-bind -n C-l run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-l) || tmux select-pane -R"
-bind -r C-h run "tmux select-pane -L"
-bind -r C-j run "tmux select-pane -D"
-bind -r C-k run "tmux select-pane -U"
-bind -r C-l run "tmux select-pane -R"
-bind -r C-Down resize-pane -D 2
-bind -r C-Up resize-pane -U 2
-bind -r C-Left resize-pane -L 2
-bind -r C-Right resize-pane -R 2
+bind -r h run "tmux select-pane -L"
+bind -r j run "tmux select-pane -D"
+bind -r k run "tmux select-pane -U"
+bind -r l run "tmux select-pane -R"
+bind -r Down resize-pane -D 2
+bind -r Up resize-pane -U 2
+bind -r Left resize-pane -L 2
+bind -r Right resize-pane -R 2
 bind-key b command-prompt -p "create pane from:"  "join-pane -s ':%%'"
 bind-key v command-prompt -p "send pane to:"  "join-pane -t ':%%'"
 
diff --git a/vimrc b/vimrc
index c20c8be..0059983 100644
--- a/vimrc
+++ b/vimrc
@@ -178,5 +178,4 @@ Bundle 'vim-scripts/taglist.vim'
 let Tlist_Use_Right_Window=1
 let Tlist_GainFocus_On_ToggleOpen = 1
 Bundle 'saltstack/salt-vim'
-Bundle 'christoomey/vim-tmux-navigator'
 "" }}}