Configuration update and clean-up.