That is the only way to ensure anything. I've seen a dozen or so threads about failing with intakes, and there is nearly a 100% chance you'll fail. You remove the tune on a flex fuel tune and run it you may as well be ready to blow it up as the stock ECU tuning will not handle the fueling mods.
So, leave it stock or put all of the mods on, take them off, and put them back on.
Sent from my SAMSUNG-SM-G935A using Tapatalk