Configuration clean-up