General config cleanup.