More .vimrc cleaning