(maint) Clean up the configuration a bit