Cleanup of vimrc