VIM cleanup