Minor config cleanup