More cleanup for configuration resetting.