diff --git a/Elwig/Helpers/Billing/BillingData.cs b/Elwig/Helpers/Billing/BillingData.cs
index 4b77dd4..072ef97 100644
--- a/Elwig/Helpers/Billing/BillingData.cs
+++ b/Elwig/Helpers/Billing/BillingData.cs
@@ -459,16 +459,10 @@ namespace Elwig.Helpers.Billing {
                 }
             }
 
-            CollapsePaymentData(payment, payment.DeepClone().AsObject(), vaributes ?? payment.Select(e => new RawVaribute(e.Key)).ToList(), useDefaultPayment);
-            CollapsePaymentData(qualityWei, qualityWei.DeepClone().AsObject(), vaributes ?? qualityWei.Select(e => new RawVaribute(e.Key)).ToList(), useDefaultQuality);
-
-            BillingData data;
-            if (origData != null && origData.Mode == CalculationMode.Elwig) {
-                data = new BillingData((JsonObject)origData.Data.DeepClone());
-            } else {
-                data = new BillingData();
-            }
+            CollapsePaymentData(payment, payment.DeepClone().AsObject(), vaributes ?? [.. payment.Select(e => new RawVaribute(e.Key))], useDefaultPayment);
+            CollapsePaymentData(qualityWei, qualityWei.DeepClone().AsObject(), vaributes ?? [.. qualityWei.Select(e => new RawVaribute(e.Key))], useDefaultQuality);
 
+            BillingData data = origData != null && origData.Mode == CalculationMode.Elwig ? new BillingData((JsonObject)origData.Data.DeepClone()) : new BillingData();
             if (payment.Count == 0) {
                 data.Data["payment"] = 0;
             } else if (payment.Count == 1 && payment.First().Key == "default") {
@@ -484,6 +478,8 @@ namespace Elwig.Helpers.Billing {
                 data.Data["quality"] = new JsonObject() {
                     ["WEI"] = qualityWei
                 };
+            } else {
+                data.Data.Remove("quality");
             }
             data.Data["curves"] = curves;