more cleanups for vimrc