diff --git a/Readme.md b/Readme.md
index e039e45..700d104 100644
--- a/Readme.md
+++ b/Readme.md
@@ -4,4 +4,4 @@
 
 Remap for the bepo layout in Lua, inspired from https://github.com/michamos/vim-bepo
 
-It aims to be faster (takes only 0.6ms at startup on my machine, while vim-bepo requires 1.6ms)
+It aims to be faster (takes only 0.4ms at startup on my machine, while vim-bepo requires 1.6ms)
diff --git a/fnl/bepo.fnl b/fnl/bepo.fnl
index 510a981..4012468 100644
--- a/fnl/bepo.fnl
+++ b/fnl/bepo.fnl
@@ -17,16 +17,14 @@
 
 (fn map-text-object [key target]
   "For text-objects mappings"
-  (if (= (vim.fn.maparg key :o) "")
-      (vim.api.nvim_set_keymap :o key target {:noremap true})
-      (= (vim.fn.maparg key :x) "")
-      (vim.api.nvim_set_keymap :x key target {:noremap true}))
+  (vim.api.nvim_set_keymap :o key target {:noremap true})
+  (vim.api.nvim_set_keymap :x key target {:noremap true})
   nil)
 
 (fn map-normal [key target]
   "For normal mode mappings"
-  (when (= (vim.fn.maparg key :n) "")
-    (vim.api.nvim_set_keymap :n key target {:noremap true})))
+  (vim.api.nvim_set_keymap :n key target {:noremap true})
+  nil)
 
 (fn map-all [key target]
   "For all directional mappings"
diff --git a/lua/bepo.lua b/lua/bepo.lua
index 7f3d2cf..fb06bff 100644
--- a/lua/bepo.lua
+++ b/lua/bepo.lua
@@ -1,18 +1,11 @@
 local function map_text_object(key, target)
-  if (vim.fn.maparg(key, "o") == "") then
-    vim.api.nvim_set_keymap("o", key, target, {noremap = true})
-  elseif (vim.fn.maparg(key, "x") == "") then
-    vim.api.nvim_set_keymap("x", key, target, {noremap = true})
-  else
-  end
+  vim.api.nvim_set_keymap("o", key, target, {noremap = true})
+  vim.api.nvim_set_keymap("x", key, target, {noremap = true})
   return nil
 end
 local function map_normal(key, target)
-  if (vim.fn.maparg(key, "n") == "") then
-    return vim.api.nvim_set_keymap("n", key, target, {noremap = true})
-  else
-    return nil
-  end
+  vim.api.nvim_set_keymap("n", key, target, {noremap = true})
+  return nil
 end
 local function map_all(key, target)
   map_normal(key, target)