More config clean up