Handle clearing the config better.