Some config cleanup.