Did some config cleanup.