More config clean-up