Suggestion: Do NOT remove Options before updating Firmware! We have never seen new Firmware that we installed remove the Options, although we have seen instances where when Firmware has been updated we were NOT able to install, or re-install the Options.
Please feel free to check this out with others here on the forum if you have doubts.
But to be safe I would NOT remove any Option unless you want to return your unit for Rigol factory repair, which by the way is very seldom ever required. If your unit works for the first 30 days Ok it will probably last much longer than 3 years (if you don't seriously abuse it yourself).
Generally when someone returns an item for Rigol factory repair they will remove the Options for you, and in general you will never be able to re-install them yourself. But then how bad can that be, because the Rigol gear is awesome for the price we pay for it even without the Options hijacked in. And, you can still buy the Options if you want them bad enough.
Please don't ask me how to remove Options. You can search for this information here in the EEVblog. And by the way the Options Can NOT be removed by us in the 'DSA800 Series. But don't worry, Rigol knows how to do it. Hi Hi