diff --git a/lua/harpoon/init.lua b/lua/harpoon/init.lua
index dee45ae..56ffdaf 100644
--- a/lua/harpoon/init.lua
+++ b/lua/harpoon/init.lua
@@ -10,6 +10,18 @@ local cache_config = string.format("%s/harpoon.json", data_path)
 
 local M = {}
 
+local the_primeagen_harpoon = vim.api.nvim_create_augroup(
+    "THE_PRIMEAGEN_HARPOON",
+    { clear = true }
+)
+
+vim.api.nvim_create_autocmd({ "BufLeave, VimLeave" }, {
+    callback = function()
+        require("harpoon.mark").store_offset()
+    end,
+    group = the_primeagen_harpoon,
+})
+
 --[[
 {
     projects = {
diff --git a/lua/harpoon/tmux.lua b/lua/harpoon/tmux.lua
index 134d92f..9cea439 100644
--- a/lua/harpoon/tmux.lua
+++ b/lua/harpoon/tmux.lua
@@ -7,11 +7,17 @@ local M = {}
 local tmux_windows = {}
 
 if global_config.tmux_autoclose_windows then
-    vim.cmd([[
-        augroup HARPOON_TMUX
-        autocmd!
-        autocmd VimLeave * :lua require('harpoon.tmux').clear_all()
-    ]])
+    local harpoon_tmux_group = vim.api.nvim_create_augroup(
+        "HARPOON_TMUX",
+        { clear = true }
+    )
+
+    vim.api.nvim_create_autocmd("VimLeave", {
+        callback = function()
+            require("harpoon.tmux").clear_all()
+        end,
+        group = harpoon_tmux_group,
+    })
 end
 
 local function create_terminal()
diff --git a/plugin/mark.vim b/plugin/mark.vim
deleted file mode 100644
index 23b09a5..0000000
--- a/plugin/mark.vim
+++ /dev/null
@@ -1,4 +0,0 @@
-augroup THE_PRIMEAGEN_HARPOON
-    autocmd!
-    autocmd BufLeave,VimLeave * :lua require('harpoon.mark').store_offset()
-augroup END