diff --git a/modules/nvim/fnl/plugins.fnl b/modules/nvim/fnl/plugins.fnl
index fd15b72..19a9202 100644
--- a/modules/nvim/fnl/plugins.fnl
+++ b/modules/nvim/fnl/plugins.fnl
@@ -71,8 +71,8 @@
           (pkg :igemnace/vim-makery)
 
           ; Windows
-          (pkg :t9md/vim-choosewin
-               {:keys ["<plug>(choosewin)"]})
+          ; (pkg :t9md/vim-choosewin
+          ;      {:keys ["<plug>(choosewin)"]})
 
           ; Utils
           (pkg :andymass/vim-matchup)
diff --git a/modules/nvim/init.fnl b/modules/nvim/init.fnl
index f7a3899..705cea7 100644
--- a/modules/nvim/init.fnl
+++ b/modules/nvim/init.fnl
@@ -13,8 +13,6 @@
   (set vim.g.loaded_matchit true)
   (set vim.g.matchup_surround_enabled true))
 
-(set vim.g.choosewin_label :QWERTASDF)
-
 (do ; Colors
   (cmd.colorscheme :blame)
   (opt {:termguicolors true
@@ -184,9 +182,6 @@
   (map :n :<C-q>      :<ESC>)
   (map :n :<C-q>q     :<ESC>)
   (map :n :<C-q><C-q> :<ESC>)
-  (map :i :<C-q><C-q> :<ESC>)
-  (when (fun.executable :nvr)
-    (set vim.env.EDITOR "nvr -cc split -c 'set bufhidden=delete' --remote-wait")))
   (map :i :<C-q><C-q> :<ESC>))
   ; (when (fun.executable :nvr)
   ;   (set vim.env.EDITOR "nvr -cc split -c 'set bufhidden=delete' --remote-wait")))
@@ -205,9 +200,10 @@
     (git-map :u :pull)
     (git-map :g :log)))
 
-(do ; Split management
-  (map :n :<C-w><C-w> "<plug>(choosewin)")
-  (map :n :<C-_> "<plug>(choosewin)"))
+; (do ; Split management
+;   (set vim.g.choosewin_label :QWERTASDF)
+;   (map :n :<C-w><C-w> "<plug>(choosewin)")
+;   (map :n :<C-_> "<plug>(choosewin)"))
 
 (do ; Search
   (when (fun.executable :rg)