From 1f28857a136d623302f174107529a2cbe6054769 Mon Sep 17 00:00:00 2001
From: Scott Horowitz <scott.horowitz@nrel.gov>
Date: Wed, 13 Nov 2024 17:26:53 -0700
Subject: [PATCH] Minor code refactor.

---
 ReportUtilityBills/measure.xml       |  6 +++---
 ReportUtilityBills/resources/util.rb | 15 +--------------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/ReportUtilityBills/measure.xml b/ReportUtilityBills/measure.xml
index 17b39b64cf..cb75deec1e 100644
--- a/ReportUtilityBills/measure.xml
+++ b/ReportUtilityBills/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>report_utility_bills</name>
   <uid>ca88a425-e59a-4bc4-af51-c7e7d1e960fe</uid>
-  <version_id>31b1e987-41c7-4d52-965d-a902f73bcd90</version_id>
-  <version_modified>2024-10-31T03:05:02Z</version_modified>
+  <version_id>6b3c51ee-095b-455c-b1f1-a1cb47e3b4a8</version_id>
+  <version_modified>2024-11-14T00:26:10Z</version_modified>
   <xml_checksum>15BF4E57</xml_checksum>
   <class_name>ReportUtilityBills</class_name>
   <display_name>Utility Bills Report</display_name>
@@ -318,7 +318,7 @@
       <filename>util.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>22F928DB</checksum>
+      <checksum>2D0AE661</checksum>
     </file>
     <file>
       <filename>Contains Demand Charges.json</filename>
diff --git a/ReportUtilityBills/resources/util.rb b/ReportUtilityBills/resources/util.rb
index 8c6c53a654..b910754c2d 100644
--- a/ReportUtilityBills/resources/util.rb
+++ b/ReportUtilityBills/resources/util.rb
@@ -16,19 +16,7 @@ def initialize(meters: [], units:)
 class UtilityRate
   def initialize()
     @flat_rate = 0.0
-    @real_time_prices = nil
-
-    @fixed_charge_monthly = nil
-    @fixed_charge_daily = nil
-
     @min_charge_monthly = 0.0
-    @min_charge_annual = nil
-
-    @net_metering_excess_sellback_type = nil
-    @net_metering_user_excess_sellback_rate = nil
-
-    @feed_in_tariff_rate = nil
-
     @energy_rate_structure = []
     @energy_weekday_schedule = []
     @energy_weekend_schedule = []
@@ -46,13 +34,12 @@ def initialize()
     @annual_energy_charge = 0.0
     @annual_fixed_charge = 0.0
     @annual_total = 0.0
+    @annual_production_credit = 0.0
 
     @monthly_energy_charge = [0.0] * 12
     @monthly_fixed_charge = [0.0] * 12
     @monthly_total = [0.0] * 12
-
     @monthly_production_credit = [0] * 12
-    @annual_production_credit = 0.0
   end
   attr_accessor(:annual_energy_charge, :annual_fixed_charge, :annual_total,
                 :monthly_energy_charge, :monthly_fixed_charge, :monthly_total,