Even moar cleanup in vimrc