Even more cruft removing from vimrc