Configuration clean-up.