Yes, that's exactly how you'd do it properly.

I'm with you on just commenting out or deleting things as you experiment up a new system config, but once you're using that config in production it's not as safe.