Config clean-up