Slight config cleanup