More config cleanup.