clean up service_type_values.yml for current behavior