Cleanup vimrc ... 2