I prefer to not remove something before there's a replacement. It always bothers me when others do this.
My best reminder of this is always: putting an oily rag back in my pocket. If I discard it you can bank on the fact that I won't find a clean one before I need it.
I have never liked SMB and have always gone far out of my way to avoid it. But it's getting harder and harder to avoid. I was forced to run samba when I got a new phone, and Google decided that ftp is to dangerous to use. But fortunately I have no reason to run an SMB client on anything but my phone.