Some config cleanup