Vimrc cleanup