diff --git a/ftdetect/hb.vim b/ftdetect/hb.vim
deleted file mode 100644
index 9974fee..0000000
--- a/ftdetect/hb.vim
+++ /dev/null
@@ -1 +0,0 @@
-autocmd BufNewFile,BufRead *.hb setfiletype hblang
diff --git a/ftdetect/hblang.vim b/ftdetect/hblang.vim
index 9974fee..c217cab 100644
--- a/ftdetect/hblang.vim
+++ b/ftdetect/hblang.vim
@@ -1 +1,2 @@
-autocmd BufNewFile,BufRead *.hb setfiletype hblang
+autocmd! BufNewFile,BufRead *.hb set filetype=hblang
+
diff --git a/ftplugin/hb.vim b/ftplugin/hb.vim
deleted file mode 100644
index 0cbbe0e..0000000
--- a/ftplugin/hb.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-setlocal commentstring=//\ %s
-