diff --git a/autoload/zettel.vim b/autoload/zettel.vim
index 780593e..fe37005 100644
--- a/autoload/zettel.vim
+++ b/autoload/zettel.vim
@@ -97,7 +97,7 @@ function s:GetTagFieldHeaders(default_overrides) abort
   " arbitary field, values in the header but
   " they are uppercased.
   "
-  " default_overrides : 
+  " default_overrides :
   " - dictionary to override the tag field defaults
   " - example : { 'togit' : 0 }
   let l:tag_field_headers = []
@@ -119,7 +119,7 @@ endfunction
 function s:GetTagFilePath(stub_path_to_tagfile)
   " stub_path_to_tagfile
   " - just the suffix, example : 'folder0/folder1/tagfile'
-  " 
+  "
   " Return
   " l:abs_path_to_tagfile
   " - abs path to the tagfile, example: '/Users/blah/.zettel/folder0/folder1/tagfile'
@@ -727,8 +727,10 @@ endfunction
 function s:IntializeAutoupdate() abort
   augroup zettel_autoupdate_tags
     " default fzf is vsplit, tab split, split, e
-    autocmd BufEnter * call zettel#autoupdate#loadMarkerDicts()
-    autocmd BufLeave,BufUnload * call zettel#autoupdate#updateFiles()
+    " may fix error message with other file type than markdown
+    autocmd!
+    autocmd BufEnter *.md call zettel#autoupdate#loadMarkerDicts()
+    autocmd BufLeave,BufUnload *.md call zettel#autoupdate#updateFiles()
   augroup END
 endfunction
 
@@ -776,7 +778,7 @@ function! zettel#listTags(in_this_file, ...) abort
     let l:filters = {"filepath": expand("%:p")}
   endif
   let l:filters["tagfile"] = a:000
-  
+
   let l:tag_lines = zettel#utils#getAllTagLines(l:filters)
   let l:source = map(copy(l:tag_lines), "s:MapGetSourceLine(v:val)")
   let l:Sink = function("s:HandleTagJump", [l:tag_lines])
diff --git a/plugin/zettel.vim b/plugin/zettel.vim
deleted file mode 100644
index 7b25531..0000000
--- a/plugin/zettel.vim
+++ /dev/null
@@ -1,106 +0,0 @@
-" Filename: plugin/zettel.vim
-" Author:   18alantom
-" License:  MIT License
-
-
-if exists("g:loaded_zettel")
-  finish
-endif
-let g:loaded_zettel = 1
-
-call zettel#initialize()
-
-
-" Tagfile Commands
-command! -nargs=+ ZettelCreateNewTagFile
-  \ call zettel#createNewTagFile(<f-args>)
-command! ZettelDeleteTagFile call zettel#deleteTagFile()
-
-" Tag Commands
-command! -nargs=* -complete=customlist,s:GetCompletionInsertTag ZettelInsertTag
-  \ call zettel#insertTag(<f-args>)
-command! -nargs=* -complete=customlist,s:GetCompletionListTags ZettelListTags
-  \ call zettel#listTags(0, <f-args>)
-command! -nargs=* -complete=customlist,s:GetCompletionListTags ZettelDeleteTag
-  \ call zettel#deleteTag(<f-args>)
-command! ZettelListTagsInThisFile call zettel#listTags(1)
-
-" Taglink Commands
-command! ZettelInsertTagLink call zettel#insertTagLink()
-command! ZettelListTagLinks call zettel#listTagLinks()
-command! ZettelListTagLinksInThisFile call zettel#listTagLinks(1)
-command! -nargs=* -complete=customlist,s:GetCompletionListTags ZettelListTagLinksToATag
-  \ call zettel#listTagLinksToATag(<f-args>)
-
-
-" Key Bindings
-if !exists("g:zettel_prevent_default_bindings")
-  nnoremap <unique> <leader>zi :ZettelInsertTag<space>
-  nnoremap <unique> <leader>zj :ZettelListTags<cr>
-  nnoremap <unique> <leader>zl :ZettelInsertTagLink<cr>
-  nnoremap <unique> <leader>zd :ZettelDeleteTag<cr>
-  nnoremap <unique> <leader>zm :emenu Zettel.
-  nnoremap <silent> <C-]> :call <SID>OverloadCtrlSqBracket()<CR>
-endif
-
-
-" Menu
-menu Zettel.Insert.Tag :ZettelInsertTag<space>
-menu Zettel.Insert.TagLink :ZettelInsertTagLink<cr>
-
-menu Zettel.List.Tags.All :ZettelListTags<cr>
-menu Zettel.List.Tags.ByTagFile :ZettelListTags<space>
-menu Zettel.List.Tags.InThisFile :ZettelListTagsInThisFile<cr>
-
-menu Zettel.List.TagLinks.All :ZettelListTagLinks<cr>
-menu Zettel.List.TagLinks.InThisFile :ZettelListTagLinksInThisFile<cr>
-menu Zettel.List.TagLinks.ByTag :ZettelListTagLinksToATag<space>
-
-menu Zettel.Delete.Tags.DisplayAll :ZettelDeleteTag<cr>
-menu Zettel.Delete.Tags.DisplayByTagFile :ZettelDeleteTag<space>
-menu Zettel.Delete.TagFiles :ZettelDeleteTagFile<cr>
-
-
-" Internal Functions
-function s:GetCompletionInsertTag(arg_lead, cmd_line, cursor_pos)
-  let l:tags = []
-  for t in split(&tags, ",")
-    if !filereadable(t)
-      continue
-    endif
-    call add(l:tags, zettel#utils#getRelativePath(t))
-  endfor
-  let l:tags = uniq(l:tags)
-  if len(a:arg_lead) > 0
-    let l:tags = filter(l:tags, {i,v -> match(v, '^' .. a:arg_lead) == 0})
-  endif
-  return l:tags
-endfunction
-
-
-function s:MapReplaceBlankWithUnscoped(tag)
-  if len(a:tag) == 0
-    return g:zettel_unscoped_tagfile_name
-  endif
-  return a:tag
-endfunction
-
-
-function s:GetCompletionListTags(arg_lead, cmd_line, cursor_pos)
-  let l:tags = s:GetCompletionInsertTag(a:arg_lead, a:cmd_line, a:cursor_pos)
-  let l:tags = map(l:tags, "s:MapReplaceBlankWithUnscoped(v:val)")
-  let l:tags = map(l:tags, {i,v -> v[:-2]})
-  return l:tags
-endfunction
-
-
-function s:OverloadCtrlSqBracket()
-  let l:zettel_jump = zettel#tagLinkJump()
-  if l:zettel_jump == 2
-    return
-  endif
-
-  if !l:zettel_jump
-    execute "normal!\<C-]>"
-  endif
-endfunction