More cleaning of vimrc