Cleanup of my vimrc