remove autocmd, tweak mapping