Yes, that sounds good. We want to be able to remove the old settings, but not require that the settings be updated simultaneously as the code is deployed.