From d1cdff31958168c52f41013eeac8d1af03565fd6 Mon Sep 17 00:00:00 2001
From: Steven Janzou <steven@janzouconsulting.com>
Date: Sun, 23 Jul 2023 03:34:42 -0600
Subject: [PATCH] Updates to incentives per 7/21/2023 meeting and for alpha
 version

---
 ...ts Wind Battery Hybrid_Host Developer.json | 408 ------------------
 ...atts Wind Battery Hybrid_Single Owner.json | 408 ------------------
 deploy/runtime/startup.lk                     |  12 +-
 3 files changed, 6 insertions(+), 822 deletions(-)

diff --git a/deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Host Developer.json b/deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Host Developer.json
index 4ca50e549a..3d1948a430 100644
--- a/deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Host Developer.json	
+++ b/deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Host Developer.json	
@@ -97,30 +97,6 @@
         "capex_table_total_installed_ac_cost": 0.0,
         "capex_table_total_installed_dc_cost": 1800.0,
         "capex_table_total_installed_land_cost": 0.0,
-        "cbi_fed_amount": 0.0,
-        "cbi_fed_deprbas_fed": 0.0,
-        "cbi_fed_deprbas_sta": 0.0,
-        "cbi_fed_maxvalue": 0.0,
-        "cbi_fed_tax_fed": 1.0,
-        "cbi_fed_tax_sta": 1.0,
-        "cbi_oth_amount": 0.0,
-        "cbi_oth_deprbas_fed": 0.0,
-        "cbi_oth_deprbas_sta": 0.0,
-        "cbi_oth_maxvalue": 0.0,
-        "cbi_oth_tax_fed": 1.0,
-        "cbi_oth_tax_sta": 1.0,
-        "cbi_sta_amount": 0.0,
-        "cbi_sta_deprbas_fed": 0.0,
-        "cbi_sta_deprbas_sta": 0.0,
-        "cbi_sta_maxvalue": 0.0,
-        "cbi_sta_tax_fed": 1.0,
-        "cbi_sta_tax_sta": 1.0,
-        "cbi_uti_amount": 0.0,
-        "cbi_uti_deprbas_fed": 0.0,
-        "cbi_uti_deprbas_sta": 0.0,
-        "cbi_uti_maxvalue": 0.0,
-        "cbi_uti_tax_fed": 1.0,
-        "cbi_uti_tax_sta": 1.0,
         "city": "-",
         "contingency": 0.0,
         "contingency_percent": 0.0,
@@ -142,50 +118,6 @@
         "grid_per_watt": 0.0,
         "grid_percent": 0.0,
         "grid_total": 0.0,
-        "ibi_fed_amount": 0.0,
-        "ibi_fed_amount_deprbas_fed": 0.0,
-        "ibi_fed_amount_deprbas_sta": 0.0,
-        "ibi_fed_amount_tax_fed": 1.0,
-        "ibi_fed_amount_tax_sta": 1.0,
-        "ibi_fed_percent": 0.0,
-        "ibi_fed_percent_deprbas_fed": 0.0,
-        "ibi_fed_percent_deprbas_sta": 0.0,
-        "ibi_fed_percent_maxvalue": 0.0,
-        "ibi_fed_percent_tax_fed": 1.0,
-        "ibi_fed_percent_tax_sta": 1.0,
-        "ibi_oth_amount": 0.0,
-        "ibi_oth_amount_deprbas_fed": 0.0,
-        "ibi_oth_amount_deprbas_sta": 0.0,
-        "ibi_oth_amount_tax_fed": 1.0,
-        "ibi_oth_amount_tax_sta": 1.0,
-        "ibi_oth_percent": 0.0,
-        "ibi_oth_percent_deprbas_fed": 0.0,
-        "ibi_oth_percent_deprbas_sta": 0.0,
-        "ibi_oth_percent_maxvalue": 0.0,
-        "ibi_oth_percent_tax_fed": 1.0,
-        "ibi_oth_percent_tax_sta": 1.0,
-        "ibi_sta_amount": 0.0,
-        "ibi_sta_amount_deprbas_fed": 0.0,
-        "ibi_sta_amount_deprbas_sta": 0.0,
-        "ibi_sta_amount_tax_fed": 1.0,
-        "ibi_sta_amount_tax_sta": 1.0,
-        "ibi_sta_percent": 0.0,
-        "ibi_sta_percent_deprbas_fed": 0.0,
-        "ibi_sta_percent_deprbas_sta": 0.0,
-        "ibi_sta_percent_maxvalue": 0.0,
-        "ibi_sta_percent_tax_fed": 1.0,
-        "ibi_sta_percent_tax_sta": 1.0,
-        "ibi_uti_amount": 0.0,
-        "ibi_uti_amount_deprbas_fed": 0.0,
-        "ibi_uti_amount_deprbas_sta": 0.0,
-        "ibi_uti_amount_tax_fed": 1.0,
-        "ibi_uti_amount_tax_sta": 1.0,
-        "ibi_uti_percent": 0.0,
-        "ibi_uti_percent_deprbas_fed": 0.0,
-        "ibi_uti_percent_deprbas_sta": 0.0,
-        "ibi_uti_percent_maxvalue": 0.0,
-        "ibi_uti_percent_tax_fed": 1.0,
-        "ibi_uti_percent_tax_sta": 1.0,
         "in_location": "Type a location name, street address, or lat,lon in decimal degrees",
         "in_location_list": "15458 Denver W Pkwy, Golden CO 804041|phoenix,az|45.5,-120.9|Manaus,Brazil",
         "in_location_options": 0.0,
@@ -209,32 +141,6 @@
         "inverterarray_power": 3.63636,
         "inverterarray_power_w": 3636.36,
         "is_advanced": 0.0,
-        "itc_fed_amount": [
-            0.0
-        ],
-        "itc_fed_amount_deprbas_fed": 1.0,
-        "itc_fed_amount_deprbas_sta": 1.0,
-        "itc_fed_percent": [
-            30.0
-        ],
-        "itc_fed_percent_deprbas_fed": 1.0,
-        "itc_fed_percent_deprbas_sta": 1.0,
-        "itc_fed_percent_maxvalue": [
-            1.0
-        ],
-        "itc_sta_amount": [
-            0.0
-        ],
-        "itc_sta_amount_deprbas_fed": 0.0,
-        "itc_sta_amount_deprbas_sta": 0.0,
-        "itc_sta_percent": [
-            0.0
-        ],
-        "itc_sta_percent_deprbas_fed": 0.0,
-        "itc_sta_percent_deprbas_sta": 0.0,
-        "itc_sta_percent_maxvalue": [
-            1.0
-        ],
         "land_area": 0.0,
         "land_area_capex": 0.0189035,
         "land_area_value": 0.0189035,
@@ -289,54 +195,12 @@
             0.0
         ],
         "om_production_escal": 0.0,
-        "pbi_fed_amount": [
-            0.0
-        ],
-        "pbi_fed_escal": 0.0,
-        "pbi_fed_for_ds": 0.0,
-        "pbi_fed_tax_fed": 1.0,
-        "pbi_fed_tax_sta": 1.0,
-        "pbi_fed_term": 0.0,
-        "pbi_oth_amount": [
-            0.0
-        ],
-        "pbi_oth_escal": 0.0,
-        "pbi_oth_for_ds": 0.0,
-        "pbi_oth_tax_fed": 1.0,
-        "pbi_oth_tax_sta": 1.0,
-        "pbi_oth_term": 0.0,
-        "pbi_sta_amount": [
-            0.0
-        ],
-        "pbi_sta_escal": 0.0,
-        "pbi_sta_for_ds": 0.0,
-        "pbi_sta_tax_fed": 1.0,
-        "pbi_sta_tax_sta": 1.0,
-        "pbi_sta_term": 0.0,
-        "pbi_uti_amount": [
-            0.0
-        ],
-        "pbi_uti_escal": 0.0,
-        "pbi_uti_for_ds": 0.0,
-        "pbi_uti_tax_fed": 1.0,
-        "pbi_uti_tax_sta": 1.0,
-        "pbi_uti_term": 0.0,
         "per_inverter": 0.71,
         "per_module": 4.84,
         "permitting_fixed": 0.0,
         "permitting_per_watt": 0.0,
         "permitting_percent": 0.0,
         "permitting_total": 0.0,
-        "ptc_fed_amount": [
-            0.0
-        ],
-        "ptc_fed_escal": 0.0,
-        "ptc_fed_term": 10.0,
-        "ptc_sta_amount": [
-            0.0
-        ],
-        "ptc_sta_escal": 0.0,
-        "ptc_sta_term": 10.0,
         "pv_capex_cost_choice": 0.0,
         "pv_land_area_is_shown": 0.0,
         "pvwatts.advanced.is_shown": 0.0,
@@ -452,30 +316,6 @@
         "bos_cost_per_kw": 0.0,
         "bos_cost_per_turbine": 0.0,
         "bos_cost_total": 0.0,
-        "cbi_fed_amount": 0.0,
-        "cbi_fed_deprbas_fed": 0.0,
-        "cbi_fed_deprbas_sta": 0.0,
-        "cbi_fed_maxvalue": 0.0,
-        "cbi_fed_tax_fed": 1.0,
-        "cbi_fed_tax_sta": 1.0,
-        "cbi_oth_amount": 0.0,
-        "cbi_oth_deprbas_fed": 0.0,
-        "cbi_oth_deprbas_sta": 0.0,
-        "cbi_oth_maxvalue": 0.0,
-        "cbi_oth_tax_fed": 1.0,
-        "cbi_oth_tax_sta": 1.0,
-        "cbi_sta_amount": 0.0,
-        "cbi_sta_deprbas_fed": 0.0,
-        "cbi_sta_deprbas_sta": 0.0,
-        "cbi_sta_maxvalue": 0.0,
-        "cbi_sta_tax_fed": 1.0,
-        "cbi_sta_tax_sta": 1.0,
-        "cbi_uti_amount": 0.0,
-        "cbi_uti_deprbas_fed": 0.0,
-        "cbi_uti_deprbas_sta": 0.0,
-        "cbi_uti_maxvalue": 0.0,
-        "cbi_uti_tax_fed": 1.0,
-        "cbi_uti_tax_sta": 1.0,
         "cols": 1.0,
         "degradation": [
             0.0
@@ -491,78 +331,8 @@
         "env_loss_total": 0.0,
         "est_bos_cost": 0.0,
         "est_turbine_cost": 0.0,
-        "ibi_fed_amount": 0.0,
-        "ibi_fed_amount_deprbas_fed": 0.0,
-        "ibi_fed_amount_deprbas_sta": 0.0,
-        "ibi_fed_amount_tax_fed": 1.0,
-        "ibi_fed_amount_tax_sta": 1.0,
-        "ibi_fed_percent": 0.0,
-        "ibi_fed_percent_deprbas_fed": 0.0,
-        "ibi_fed_percent_deprbas_sta": 0.0,
-        "ibi_fed_percent_maxvalue": 0.0,
-        "ibi_fed_percent_tax_fed": 1.0,
-        "ibi_fed_percent_tax_sta": 1.0,
-        "ibi_oth_amount": 0.0,
-        "ibi_oth_amount_deprbas_fed": 0.0,
-        "ibi_oth_amount_deprbas_sta": 0.0,
-        "ibi_oth_amount_tax_fed": 1.0,
-        "ibi_oth_amount_tax_sta": 1.0,
-        "ibi_oth_percent": 0.0,
-        "ibi_oth_percent_deprbas_fed": 0.0,
-        "ibi_oth_percent_deprbas_sta": 0.0,
-        "ibi_oth_percent_maxvalue": 0.0,
-        "ibi_oth_percent_tax_fed": 1.0,
-        "ibi_oth_percent_tax_sta": 1.0,
-        "ibi_sta_amount": 0.0,
-        "ibi_sta_amount_deprbas_fed": 0.0,
-        "ibi_sta_amount_deprbas_sta": 0.0,
-        "ibi_sta_amount_tax_fed": 1.0,
-        "ibi_sta_amount_tax_sta": 1.0,
-        "ibi_sta_percent": 0.0,
-        "ibi_sta_percent_deprbas_fed": 0.0,
-        "ibi_sta_percent_deprbas_sta": 0.0,
-        "ibi_sta_percent_maxvalue": 0.0,
-        "ibi_sta_percent_tax_fed": 1.0,
-        "ibi_sta_percent_tax_sta": 1.0,
-        "ibi_uti_amount": 0.0,
-        "ibi_uti_amount_deprbas_fed": 0.0,
-        "ibi_uti_amount_deprbas_sta": 0.0,
-        "ibi_uti_amount_tax_fed": 1.0,
-        "ibi_uti_amount_tax_sta": 1.0,
-        "ibi_uti_percent": 0.0,
-        "ibi_uti_percent_deprbas_fed": 0.0,
-        "ibi_uti_percent_deprbas_sta": 0.0,
-        "ibi_uti_percent_maxvalue": 0.0,
-        "ibi_uti_percent_tax_fed": 1.0,
-        "ibi_uti_percent_tax_sta": 1.0,
         "inflation_rate": 2.5,
         "install_type": 0.0,
-        "itc_fed_amount": [
-            0.0
-        ],
-        "itc_fed_amount_deprbas_fed": 1.0,
-        "itc_fed_amount_deprbas_sta": 1.0,
-        "itc_fed_percent": [
-            30.0
-        ],
-        "itc_fed_percent_deprbas_fed": 1.0,
-        "itc_fed_percent_deprbas_sta": 1.0,
-        "itc_fed_percent_maxvalue": [
-            1.0
-        ],
-        "itc_sta_amount": [
-            0.0
-        ],
-        "itc_sta_amount_deprbas_fed": 0.0,
-        "itc_sta_amount_deprbas_sta": 0.0,
-        "itc_sta_percent": [
-            0.0
-        ],
-        "itc_sta_percent_deprbas_fed": 0.0,
-        "itc_sta_percent_deprbas_sta": 0.0,
-        "itc_sta_percent_maxvalue": [
-            1.0
-        ],
         "om_capacity": [
             50.0
         ],
@@ -580,48 +350,6 @@
         "ops_load_loss": 0.0,
         "ops_loss_total": 0.0,
         "ops_strategies_loss": 0.0,
-        "pbi_fed_amount": [
-            0.0
-        ],
-        "pbi_fed_escal": 0.0,
-        "pbi_fed_for_ds": 0.0,
-        "pbi_fed_tax_fed": 1.0,
-        "pbi_fed_tax_sta": 1.0,
-        "pbi_fed_term": 0.0,
-        "pbi_oth_amount": [
-            0.0
-        ],
-        "pbi_oth_escal": 0.0,
-        "pbi_oth_for_ds": 0.0,
-        "pbi_oth_tax_fed": 1.0,
-        "pbi_oth_tax_sta": 1.0,
-        "pbi_oth_term": 0.0,
-        "pbi_sta_amount": [
-            0.0
-        ],
-        "pbi_sta_escal": 0.0,
-        "pbi_sta_for_ds": 0.0,
-        "pbi_sta_tax_fed": 1.0,
-        "pbi_sta_tax_sta": 1.0,
-        "pbi_sta_term": 0.0,
-        "pbi_uti_amount": [
-            0.0
-        ],
-        "pbi_uti_escal": 0.0,
-        "pbi_uti_for_ds": 0.0,
-        "pbi_uti_tax_fed": 1.0,
-        "pbi_uti_tax_sta": 1.0,
-        "pbi_uti_term": 0.0,
-        "ptc_fed_amount": [
-            0.0
-        ],
-        "ptc_fed_escal": 0.0,
-        "ptc_fed_term": 10.0,
-        "ptc_sta_amount": [
-            0.0
-        ],
-        "ptc_sta_escal": 0.0,
-        "ptc_sta_term": 10.0,
         "reference_capacity": 1.0,
         "reference_number_turbines": 1.0,
         "reference_resource_file": "WY Southern-Flat Lands.srw",
@@ -9866,30 +9594,6 @@
                 104.0
             ]
         ],
-        "cbi_fed_amount": 0.0,
-        "cbi_fed_deprbas_fed": 0.0,
-        "cbi_fed_deprbas_sta": 0.0,
-        "cbi_fed_maxvalue": 0.0,
-        "cbi_fed_tax_fed": 1.0,
-        "cbi_fed_tax_sta": 1.0,
-        "cbi_oth_amount": 0.0,
-        "cbi_oth_deprbas_fed": 0.0,
-        "cbi_oth_deprbas_sta": 0.0,
-        "cbi_oth_maxvalue": 0.0,
-        "cbi_oth_tax_fed": 1.0,
-        "cbi_oth_tax_sta": 1.0,
-        "cbi_sta_amount": 0.0,
-        "cbi_sta_deprbas_fed": 0.0,
-        "cbi_sta_deprbas_sta": 0.0,
-        "cbi_sta_maxvalue": 0.0,
-        "cbi_sta_tax_fed": 1.0,
-        "cbi_sta_tax_sta": 1.0,
-        "cbi_uti_amount": 0.0,
-        "cbi_uti_deprbas_fed": 0.0,
-        "cbi_uti_deprbas_sta": 0.0,
-        "cbi_uti_maxvalue": 0.0,
-        "cbi_uti_tax_fed": 1.0,
-        "cbi_uti_tax_sta": 1.0,
         "compute_as_cube": 1.0,
         "dispatch_manual_btm_discharge_to_grid": [
             0.0,
@@ -11217,77 +10921,7 @@
         "genericsys.cost.sales_tax.percent": 0.0,
         "genericsys.cost.sales_tax.total": 0.0,
         "genericsys.cost.sales_tax.value": 0.0,
-        "ibi_fed_amount": 0.0,
-        "ibi_fed_amount_deprbas_fed": 0.0,
-        "ibi_fed_amount_deprbas_sta": 0.0,
-        "ibi_fed_amount_tax_fed": 1.0,
-        "ibi_fed_amount_tax_sta": 1.0,
-        "ibi_fed_percent": 0.0,
-        "ibi_fed_percent_deprbas_fed": 0.0,
-        "ibi_fed_percent_deprbas_sta": 0.0,
-        "ibi_fed_percent_maxvalue": 0.0,
-        "ibi_fed_percent_tax_fed": 1.0,
-        "ibi_fed_percent_tax_sta": 1.0,
-        "ibi_oth_amount": 0.0,
-        "ibi_oth_amount_deprbas_fed": 0.0,
-        "ibi_oth_amount_deprbas_sta": 0.0,
-        "ibi_oth_amount_tax_fed": 1.0,
-        "ibi_oth_amount_tax_sta": 1.0,
-        "ibi_oth_percent": 0.0,
-        "ibi_oth_percent_deprbas_fed": 0.0,
-        "ibi_oth_percent_deprbas_sta": 0.0,
-        "ibi_oth_percent_maxvalue": 0.0,
-        "ibi_oth_percent_tax_fed": 1.0,
-        "ibi_oth_percent_tax_sta": 1.0,
-        "ibi_sta_amount": 0.0,
-        "ibi_sta_amount_deprbas_fed": 0.0,
-        "ibi_sta_amount_deprbas_sta": 0.0,
-        "ibi_sta_amount_tax_fed": 1.0,
-        "ibi_sta_amount_tax_sta": 1.0,
-        "ibi_sta_percent": 0.0,
-        "ibi_sta_percent_deprbas_fed": 0.0,
-        "ibi_sta_percent_deprbas_sta": 0.0,
-        "ibi_sta_percent_maxvalue": 0.0,
-        "ibi_sta_percent_tax_fed": 1.0,
-        "ibi_sta_percent_tax_sta": 1.0,
-        "ibi_uti_amount": 0.0,
-        "ibi_uti_amount_deprbas_fed": 0.0,
-        "ibi_uti_amount_deprbas_sta": 0.0,
-        "ibi_uti_amount_tax_fed": 1.0,
-        "ibi_uti_amount_tax_sta": 1.0,
-        "ibi_uti_percent": 0.0,
-        "ibi_uti_percent_deprbas_fed": 0.0,
-        "ibi_uti_percent_deprbas_sta": 0.0,
-        "ibi_uti_percent_maxvalue": 0.0,
-        "ibi_uti_percent_tax_fed": 1.0,
-        "ibi_uti_percent_tax_sta": 1.0,
         "inflation_rate": 2.5,
-        "itc_fed_amount": [
-            0.0
-        ],
-        "itc_fed_amount_deprbas_fed": 1.0,
-        "itc_fed_amount_deprbas_sta": 1.0,
-        "itc_fed_percent": [
-            30.0
-        ],
-        "itc_fed_percent_deprbas_fed": 1.0,
-        "itc_fed_percent_deprbas_sta": 1.0,
-        "itc_fed_percent_maxvalue": [
-            1.0
-        ],
-        "itc_sta_amount": [
-            0.0
-        ],
-        "itc_sta_amount_deprbas_fed": 0.0,
-        "itc_sta_amount_deprbas_sta": 0.0,
-        "itc_sta_percent": [
-            0.0
-        ],
-        "itc_sta_percent_deprbas_fed": 0.0,
-        "itc_sta_percent_deprbas_sta": 0.0,
-        "itc_sta_percent_maxvalue": [
-            1.0
-        ],
         "load": [
             65.6374,
             62.5244,
@@ -20073,54 +19707,12 @@
         "om_fixed_escal": 0.0,
         "om_production_escal": 0.0,
         "om_replacement_cost_escal": 0.0,
-        "pbi_fed_amount": [
-            0.0
-        ],
-        "pbi_fed_escal": 0.0,
-        "pbi_fed_for_ds": 0.0,
-        "pbi_fed_tax_fed": 1.0,
-        "pbi_fed_tax_sta": 1.0,
-        "pbi_fed_term": 0.0,
-        "pbi_oth_amount": [
-            0.0
-        ],
-        "pbi_oth_escal": 0.0,
-        "pbi_oth_for_ds": 0.0,
-        "pbi_oth_tax_fed": 1.0,
-        "pbi_oth_tax_sta": 1.0,
-        "pbi_oth_term": 0.0,
-        "pbi_sta_amount": [
-            0.0
-        ],
-        "pbi_sta_escal": 0.0,
-        "pbi_sta_for_ds": 0.0,
-        "pbi_sta_tax_fed": 1.0,
-        "pbi_sta_tax_sta": 1.0,
-        "pbi_sta_term": 0.0,
-        "pbi_uti_amount": [
-            0.0
-        ],
-        "pbi_uti_escal": 0.0,
-        "pbi_uti_for_ds": 0.0,
-        "pbi_uti_tax_fed": 1.0,
-        "pbi_uti_tax_sta": 1.0,
-        "pbi_uti_term": 0.0,
         "peak_shaving_batt_dispatch_choice": 0.0,
         "ppa_escalation": 1.0,
         "ppa_multiplier_model": 0.0,
         "ppa_price_input": [
             0.0
         ],
-        "ptc_fed_amount": [
-            0.0
-        ],
-        "ptc_fed_escal": 0.0,
-        "ptc_fed_term": 10.0,
-        "ptc_sta_amount": [
-            0.0
-        ],
-        "ptc_sta_escal": 0.0,
-        "ptc_sta_term": 10.0,
         "pv.storage.p1.charge": 1.0,
         "pv.storage.p1.discharge": 0.0,
         "pv.storage.p1.dischargetogrid": 0.0,
diff --git a/deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Single Owner.json b/deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Single Owner.json
index 833d98c0f4..779143a1cf 100644
--- a/deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Single Owner.json	
+++ b/deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Single Owner.json	
@@ -97,30 +97,6 @@
         "capex_table_total_installed_ac_cost": 0.0,
         "capex_table_total_installed_dc_cost": 90000000.0,
         "capex_table_total_installed_land_cost": 0.0,
-        "cbi_fed_amount": 0.0,
-        "cbi_fed_deprbas_fed": 0.0,
-        "cbi_fed_deprbas_sta": 0.0,
-        "cbi_fed_maxvalue": 0.0,
-        "cbi_fed_tax_fed": 1.0,
-        "cbi_fed_tax_sta": 1.0,
-        "cbi_oth_amount": 0.0,
-        "cbi_oth_deprbas_fed": 0.0,
-        "cbi_oth_deprbas_sta": 0.0,
-        "cbi_oth_maxvalue": 0.0,
-        "cbi_oth_tax_fed": 1.0,
-        "cbi_oth_tax_sta": 1.0,
-        "cbi_sta_amount": 0.0,
-        "cbi_sta_deprbas_fed": 0.0,
-        "cbi_sta_deprbas_sta": 0.0,
-        "cbi_sta_maxvalue": 0.0,
-        "cbi_sta_tax_fed": 1.0,
-        "cbi_sta_tax_sta": 1.0,
-        "cbi_uti_amount": 0.0,
-        "cbi_uti_deprbas_fed": 0.0,
-        "cbi_uti_deprbas_sta": 0.0,
-        "cbi_uti_maxvalue": 0.0,
-        "cbi_uti_tax_fed": 1.0,
-        "cbi_uti_tax_sta": 1.0,
         "city": "-",
         "contingency": 0.0,
         "contingency_percent": 0.0,
@@ -142,50 +118,6 @@
         "grid_per_watt": 0.02,
         "grid_percent": 0.0,
         "grid_total": 4000000.0,
-        "ibi_fed_amount": 0.0,
-        "ibi_fed_amount_deprbas_fed": 0.0,
-        "ibi_fed_amount_deprbas_sta": 0.0,
-        "ibi_fed_amount_tax_fed": 1.0,
-        "ibi_fed_amount_tax_sta": 1.0,
-        "ibi_fed_percent": 0.0,
-        "ibi_fed_percent_deprbas_fed": 0.0,
-        "ibi_fed_percent_deprbas_sta": 0.0,
-        "ibi_fed_percent_maxvalue": 0.0,
-        "ibi_fed_percent_tax_fed": 1.0,
-        "ibi_fed_percent_tax_sta": 1.0,
-        "ibi_oth_amount": 0.0,
-        "ibi_oth_amount_deprbas_fed": 0.0,
-        "ibi_oth_amount_deprbas_sta": 0.0,
-        "ibi_oth_amount_tax_fed": 1.0,
-        "ibi_oth_amount_tax_sta": 1.0,
-        "ibi_oth_percent": 0.0,
-        "ibi_oth_percent_deprbas_fed": 0.0,
-        "ibi_oth_percent_deprbas_sta": 0.0,
-        "ibi_oth_percent_maxvalue": 0.0,
-        "ibi_oth_percent_tax_fed": 1.0,
-        "ibi_oth_percent_tax_sta": 1.0,
-        "ibi_sta_amount": 0.0,
-        "ibi_sta_amount_deprbas_fed": 0.0,
-        "ibi_sta_amount_deprbas_sta": 0.0,
-        "ibi_sta_amount_tax_fed": 1.0,
-        "ibi_sta_amount_tax_sta": 1.0,
-        "ibi_sta_percent": 0.0,
-        "ibi_sta_percent_deprbas_fed": 0.0,
-        "ibi_sta_percent_deprbas_sta": 0.0,
-        "ibi_sta_percent_maxvalue": 0.0,
-        "ibi_sta_percent_tax_fed": 1.0,
-        "ibi_sta_percent_tax_sta": 1.0,
-        "ibi_uti_amount": 0.0,
-        "ibi_uti_amount_deprbas_fed": 0.0,
-        "ibi_uti_amount_deprbas_sta": 0.0,
-        "ibi_uti_amount_tax_fed": 1.0,
-        "ibi_uti_amount_tax_sta": 1.0,
-        "ibi_uti_percent": 0.0,
-        "ibi_uti_percent_deprbas_fed": 0.0,
-        "ibi_uti_percent_deprbas_sta": 0.0,
-        "ibi_uti_percent_maxvalue": 0.0,
-        "ibi_uti_percent_tax_fed": 1.0,
-        "ibi_uti_percent_tax_sta": 1.0,
         "in_location": "Type a location name, street address, or lat,lon in decimal degrees",
         "in_location_list": "15458 Denver W Pkwy, Golden CO 804041|phoenix,az|45.5,-120.9|Manaus,Brazil",
         "in_location_options": 0.0,
@@ -209,32 +141,6 @@
         "inverterarray_power": 153846.0,
         "inverterarray_power_w": 153846000.0,
         "is_advanced": 0.0,
-        "itc_fed_amount": [
-            0.0
-        ],
-        "itc_fed_amount_deprbas_fed": 1.0,
-        "itc_fed_amount_deprbas_sta": 1.0,
-        "itc_fed_percent": [
-            30.0
-        ],
-        "itc_fed_percent_deprbas_fed": 1.0,
-        "itc_fed_percent_deprbas_sta": 1.0,
-        "itc_fed_percent_maxvalue": [
-            1.0
-        ],
-        "itc_sta_amount": [
-            0.0
-        ],
-        "itc_sta_amount_deprbas_fed": 0.0,
-        "itc_sta_amount_deprbas_sta": 0.0,
-        "itc_sta_percent": [
-            0.0
-        ],
-        "itc_sta_percent_deprbas_fed": 0.0,
-        "itc_sta_percent_deprbas_sta": 0.0,
-        "itc_sta_percent_maxvalue": [
-            1.0
-        ],
         "land_area": 0.0,
         "land_area_capex": 1300.55,
         "land_area_value": 1300.55,
@@ -289,54 +195,12 @@
             0.0
         ],
         "om_production_escal": 0.0,
-        "pbi_fed_amount": [
-            0.0
-        ],
-        "pbi_fed_escal": 0.0,
-        "pbi_fed_for_ds": 0.0,
-        "pbi_fed_tax_fed": 1.0,
-        "pbi_fed_tax_sta": 1.0,
-        "pbi_fed_term": 0.0,
-        "pbi_oth_amount": [
-            0.0
-        ],
-        "pbi_oth_escal": 0.0,
-        "pbi_oth_for_ds": 0.0,
-        "pbi_oth_tax_fed": 1.0,
-        "pbi_oth_tax_sta": 1.0,
-        "pbi_oth_term": 0.0,
-        "pbi_sta_amount": [
-            0.0
-        ],
-        "pbi_sta_escal": 0.0,
-        "pbi_sta_for_ds": 0.0,
-        "pbi_sta_tax_fed": 1.0,
-        "pbi_sta_tax_sta": 1.0,
-        "pbi_sta_term": 0.0,
-        "pbi_uti_amount": [
-            0.0
-        ],
-        "pbi_uti_escal": 0.0,
-        "pbi_uti_for_ds": 0.0,
-        "pbi_uti_tax_fed": 1.0,
-        "pbi_uti_tax_sta": 1.0,
-        "pbi_uti_term": 0.0,
         "per_inverter": 0.03,
         "per_module": 0.37,
         "permitting_fixed": 0.0,
         "permitting_per_watt": 0.01,
         "permitting_percent": 0.0,
         "permitting_total": 2000000.0,
-        "ptc_fed_amount": [
-            0.0
-        ],
-        "ptc_fed_escal": 0.0,
-        "ptc_fed_term": 10.0,
-        "ptc_sta_amount": [
-            0.0
-        ],
-        "ptc_sta_escal": 0.0,
-        "ptc_sta_term": 10.0,
         "pv_capex_cost_choice": 0.0,
         "pv_land_area_is_shown": 0.0,
         "pvwatts.advanced.is_shown": 1.0,
@@ -476,30 +340,6 @@
         "bos_cost_per_kw": 357.0,
         "bos_cost_per_turbine": 0.0,
         "bos_cost_total": 32130000.0,
-        "cbi_fed_amount": 0.0,
-        "cbi_fed_deprbas_fed": 0.0,
-        "cbi_fed_deprbas_sta": 0.0,
-        "cbi_fed_maxvalue": 0.0,
-        "cbi_fed_tax_fed": 1.0,
-        "cbi_fed_tax_sta": 1.0,
-        "cbi_oth_amount": 0.0,
-        "cbi_oth_deprbas_fed": 0.0,
-        "cbi_oth_deprbas_sta": 0.0,
-        "cbi_oth_maxvalue": 0.0,
-        "cbi_oth_tax_fed": 1.0,
-        "cbi_oth_tax_sta": 1.0,
-        "cbi_sta_amount": 0.0,
-        "cbi_sta_deprbas_fed": 0.0,
-        "cbi_sta_deprbas_sta": 0.0,
-        "cbi_sta_maxvalue": 0.0,
-        "cbi_sta_tax_fed": 1.0,
-        "cbi_sta_tax_sta": 1.0,
-        "cbi_uti_amount": 0.0,
-        "cbi_uti_deprbas_fed": 0.0,
-        "cbi_uti_deprbas_sta": 0.0,
-        "cbi_uti_maxvalue": 0.0,
-        "cbi_uti_tax_fed": 1.0,
-        "cbi_uti_tax_sta": 1.0,
         "cols": 1.0,
         "degradation": [
             0.0
@@ -515,78 +355,8 @@
         "env_loss_total": 0.0,
         "est_bos_cost": 0.0,
         "est_turbine_cost": 0.0,
-        "ibi_fed_amount": 0.0,
-        "ibi_fed_amount_deprbas_fed": 0.0,
-        "ibi_fed_amount_deprbas_sta": 0.0,
-        "ibi_fed_amount_tax_fed": 1.0,
-        "ibi_fed_amount_tax_sta": 1.0,
-        "ibi_fed_percent": 0.0,
-        "ibi_fed_percent_deprbas_fed": 0.0,
-        "ibi_fed_percent_deprbas_sta": 0.0,
-        "ibi_fed_percent_maxvalue": 0.0,
-        "ibi_fed_percent_tax_fed": 1.0,
-        "ibi_fed_percent_tax_sta": 1.0,
-        "ibi_oth_amount": 0.0,
-        "ibi_oth_amount_deprbas_fed": 0.0,
-        "ibi_oth_amount_deprbas_sta": 0.0,
-        "ibi_oth_amount_tax_fed": 1.0,
-        "ibi_oth_amount_tax_sta": 1.0,
-        "ibi_oth_percent": 0.0,
-        "ibi_oth_percent_deprbas_fed": 0.0,
-        "ibi_oth_percent_deprbas_sta": 0.0,
-        "ibi_oth_percent_maxvalue": 0.0,
-        "ibi_oth_percent_tax_fed": 1.0,
-        "ibi_oth_percent_tax_sta": 1.0,
-        "ibi_sta_amount": 0.0,
-        "ibi_sta_amount_deprbas_fed": 0.0,
-        "ibi_sta_amount_deprbas_sta": 0.0,
-        "ibi_sta_amount_tax_fed": 1.0,
-        "ibi_sta_amount_tax_sta": 1.0,
-        "ibi_sta_percent": 0.0,
-        "ibi_sta_percent_deprbas_fed": 0.0,
-        "ibi_sta_percent_deprbas_sta": 0.0,
-        "ibi_sta_percent_maxvalue": 0.0,
-        "ibi_sta_percent_tax_fed": 1.0,
-        "ibi_sta_percent_tax_sta": 1.0,
-        "ibi_uti_amount": 0.0,
-        "ibi_uti_amount_deprbas_fed": 0.0,
-        "ibi_uti_amount_deprbas_sta": 0.0,
-        "ibi_uti_amount_tax_fed": 1.0,
-        "ibi_uti_amount_tax_sta": 1.0,
-        "ibi_uti_percent": 0.0,
-        "ibi_uti_percent_deprbas_fed": 0.0,
-        "ibi_uti_percent_deprbas_sta": 0.0,
-        "ibi_uti_percent_maxvalue": 0.0,
-        "ibi_uti_percent_tax_fed": 1.0,
-        "ibi_uti_percent_tax_sta": 1.0,
         "inflation_rate": 2.5,
         "install_type": 0.0,
-        "itc_fed_amount": [
-            0.0
-        ],
-        "itc_fed_amount_deprbas_fed": 1.0,
-        "itc_fed_amount_deprbas_sta": 1.0,
-        "itc_fed_percent": [
-            30.0
-        ],
-        "itc_fed_percent_deprbas_fed": 1.0,
-        "itc_fed_percent_deprbas_sta": 1.0,
-        "itc_fed_percent_maxvalue": [
-            1.0
-        ],
-        "itc_sta_amount": [
-            0.0
-        ],
-        "itc_sta_amount_deprbas_fed": 0.0,
-        "itc_sta_amount_deprbas_sta": 0.0,
-        "itc_sta_percent": [
-            0.0
-        ],
-        "itc_sta_percent_deprbas_fed": 0.0,
-        "itc_sta_percent_deprbas_sta": 0.0,
-        "itc_sta_percent_maxvalue": [
-            1.0
-        ],
         "om_capacity": [
             43.0
         ],
@@ -604,48 +374,6 @@
         "ops_load_loss": 0.0,
         "ops_loss_total": 0.0,
         "ops_strategies_loss": 0.0,
-        "pbi_fed_amount": [
-            0.0
-        ],
-        "pbi_fed_escal": 0.0,
-        "pbi_fed_for_ds": 0.0,
-        "pbi_fed_tax_fed": 1.0,
-        "pbi_fed_tax_sta": 1.0,
-        "pbi_fed_term": 0.0,
-        "pbi_oth_amount": [
-            0.0
-        ],
-        "pbi_oth_escal": 0.0,
-        "pbi_oth_for_ds": 0.0,
-        "pbi_oth_tax_fed": 1.0,
-        "pbi_oth_tax_sta": 1.0,
-        "pbi_oth_term": 0.0,
-        "pbi_sta_amount": [
-            0.0
-        ],
-        "pbi_sta_escal": 0.0,
-        "pbi_sta_for_ds": 0.0,
-        "pbi_sta_tax_fed": 1.0,
-        "pbi_sta_tax_sta": 1.0,
-        "pbi_sta_term": 0.0,
-        "pbi_uti_amount": [
-            0.0
-        ],
-        "pbi_uti_escal": 0.0,
-        "pbi_uti_for_ds": 0.0,
-        "pbi_uti_tax_fed": 1.0,
-        "pbi_uti_tax_sta": 1.0,
-        "pbi_uti_term": 0.0,
-        "ptc_fed_amount": [
-            0.0
-        ],
-        "ptc_fed_escal": 0.0,
-        "ptc_fed_term": 10.0,
-        "ptc_sta_amount": [
-            0.0
-        ],
-        "ptc_sta_escal": 0.0,
-        "ptc_sta_term": 10.0,
         "reference_capacity": 90000.0,
         "reference_number_turbines": 36.0,
         "reference_resource_file": "WY Southern-Flat Lands.srw",
@@ -10541,30 +10269,6 @@
                 104.0
             ]
         ],
-        "cbi_fed_amount": 0.0,
-        "cbi_fed_deprbas_fed": 0.0,
-        "cbi_fed_deprbas_sta": 0.0,
-        "cbi_fed_maxvalue": 0.0,
-        "cbi_fed_tax_fed": 1.0,
-        "cbi_fed_tax_sta": 1.0,
-        "cbi_oth_amount": 0.0,
-        "cbi_oth_deprbas_fed": 0.0,
-        "cbi_oth_deprbas_sta": 0.0,
-        "cbi_oth_maxvalue": 0.0,
-        "cbi_oth_tax_fed": 1.0,
-        "cbi_oth_tax_sta": 1.0,
-        "cbi_sta_amount": 0.0,
-        "cbi_sta_deprbas_fed": 0.0,
-        "cbi_sta_deprbas_sta": 0.0,
-        "cbi_sta_maxvalue": 0.0,
-        "cbi_sta_tax_fed": 1.0,
-        "cbi_sta_tax_sta": 1.0,
-        "cbi_uti_amount": 0.0,
-        "cbi_uti_deprbas_fed": 0.0,
-        "cbi_uti_deprbas_sta": 0.0,
-        "cbi_uti_maxvalue": 0.0,
-        "cbi_uti_tax_fed": 1.0,
-        "cbi_uti_tax_sta": 1.0,
         "compute_as_cube": 1.0,
         "dispatch_manual_btm_discharge_to_grid": [
             0.0,
@@ -11892,77 +11596,7 @@
         "genericsys.cost.sales_tax.total": 4403700.0,
         "genericsys.cost.sales_tax.value": 5.0,
         "grid_interconnection_limit_kwac": 20000.0,
-        "ibi_fed_amount": 0.0,
-        "ibi_fed_amount_deprbas_fed": 0.0,
-        "ibi_fed_amount_deprbas_sta": 0.0,
-        "ibi_fed_amount_tax_fed": 1.0,
-        "ibi_fed_amount_tax_sta": 1.0,
-        "ibi_fed_percent": 0.0,
-        "ibi_fed_percent_deprbas_fed": 0.0,
-        "ibi_fed_percent_deprbas_sta": 0.0,
-        "ibi_fed_percent_maxvalue": 0.0,
-        "ibi_fed_percent_tax_fed": 1.0,
-        "ibi_fed_percent_tax_sta": 1.0,
-        "ibi_oth_amount": 0.0,
-        "ibi_oth_amount_deprbas_fed": 0.0,
-        "ibi_oth_amount_deprbas_sta": 0.0,
-        "ibi_oth_amount_tax_fed": 1.0,
-        "ibi_oth_amount_tax_sta": 1.0,
-        "ibi_oth_percent": 0.0,
-        "ibi_oth_percent_deprbas_fed": 0.0,
-        "ibi_oth_percent_deprbas_sta": 0.0,
-        "ibi_oth_percent_maxvalue": 0.0,
-        "ibi_oth_percent_tax_fed": 1.0,
-        "ibi_oth_percent_tax_sta": 1.0,
-        "ibi_sta_amount": 0.0,
-        "ibi_sta_amount_deprbas_fed": 0.0,
-        "ibi_sta_amount_deprbas_sta": 0.0,
-        "ibi_sta_amount_tax_fed": 1.0,
-        "ibi_sta_amount_tax_sta": 1.0,
-        "ibi_sta_percent": 0.0,
-        "ibi_sta_percent_deprbas_fed": 0.0,
-        "ibi_sta_percent_deprbas_sta": 0.0,
-        "ibi_sta_percent_maxvalue": 0.0,
-        "ibi_sta_percent_tax_fed": 1.0,
-        "ibi_sta_percent_tax_sta": 1.0,
-        "ibi_uti_amount": 0.0,
-        "ibi_uti_amount_deprbas_fed": 0.0,
-        "ibi_uti_amount_deprbas_sta": 0.0,
-        "ibi_uti_amount_tax_fed": 1.0,
-        "ibi_uti_amount_tax_sta": 1.0,
-        "ibi_uti_percent": 0.0,
-        "ibi_uti_percent_deprbas_fed": 0.0,
-        "ibi_uti_percent_deprbas_sta": 0.0,
-        "ibi_uti_percent_maxvalue": 0.0,
-        "ibi_uti_percent_tax_fed": 1.0,
-        "ibi_uti_percent_tax_sta": 1.0,
         "inflation_rate": 2.5,
-        "itc_fed_amount": [
-            0.0
-        ],
-        "itc_fed_amount_deprbas_fed": 1.0,
-        "itc_fed_amount_deprbas_sta": 1.0,
-        "itc_fed_percent": [
-            30.0
-        ],
-        "itc_fed_percent_deprbas_fed": 1.0,
-        "itc_fed_percent_deprbas_sta": 1.0,
-        "itc_fed_percent_maxvalue": [
-            1.0
-        ],
-        "itc_sta_amount": [
-            0.0
-        ],
-        "itc_sta_amount_deprbas_fed": 0.0,
-        "itc_sta_amount_deprbas_sta": 0.0,
-        "itc_sta_percent": [
-            0.0
-        ],
-        "itc_sta_percent_deprbas_fed": 0.0,
-        "itc_sta_percent_deprbas_sta": 0.0,
-        "itc_sta_percent_maxvalue": [
-            1.0
-        ],
         "om_batt_capacity_cost": [
             10.0
         ],
@@ -11980,53 +11614,11 @@
         "om_fixed_escal": 0.0,
         "om_production_escal": 0.0,
         "om_replacement_cost_escal": 0.0,
-        "pbi_fed_amount": [
-            0.0
-        ],
-        "pbi_fed_escal": 0.0,
-        "pbi_fed_for_ds": 0.0,
-        "pbi_fed_tax_fed": 1.0,
-        "pbi_fed_tax_sta": 1.0,
-        "pbi_fed_term": 0.0,
-        "pbi_oth_amount": [
-            0.0
-        ],
-        "pbi_oth_escal": 0.0,
-        "pbi_oth_for_ds": 0.0,
-        "pbi_oth_tax_fed": 1.0,
-        "pbi_oth_tax_sta": 1.0,
-        "pbi_oth_term": 0.0,
-        "pbi_sta_amount": [
-            0.0
-        ],
-        "pbi_sta_escal": 0.0,
-        "pbi_sta_for_ds": 0.0,
-        "pbi_sta_tax_fed": 1.0,
-        "pbi_sta_tax_sta": 1.0,
-        "pbi_sta_term": 0.0,
-        "pbi_uti_amount": [
-            0.0
-        ],
-        "pbi_uti_escal": 0.0,
-        "pbi_uti_for_ds": 0.0,
-        "pbi_uti_tax_fed": 1.0,
-        "pbi_uti_tax_sta": 1.0,
-        "pbi_uti_term": 0.0,
         "ppa_escalation": 1.0,
         "ppa_multiplier_model": 0.0,
         "ppa_price_input": [
             0.0
         ],
-        "ptc_fed_amount": [
-            0.0
-        ],
-        "ptc_fed_escal": 0.0,
-        "ptc_fed_term": 10.0,
-        "ptc_sta_amount": [
-            0.0
-        ],
-        "ptc_sta_escal": 0.0,
-        "ptc_sta_term": 10.0,
         "pv.storage.p1.charge": 1.0,
         "pv.storage.p1.discharge": 0.0,
         "pv.storage.p1.dischargetogrid": 0.0,
diff --git a/deploy/runtime/startup.lk b/deploy/runtime/startup.lk
index 8c20134077..ae22b142ec 100644
--- a/deploy/runtime/startup.lk
+++ b/deploy/runtime/startup.lk
@@ -2551,7 +2551,7 @@ addpage( [[ 'PVWatts', {'name'='PV Land Area', 'caption' = 'Land Area', 'collaps
 addpage( [[ 'Degradation AC Single Year'], ], { 'sidebar'='PV Degradation','help'='degradation', 'bin_name'='PVWatts' } );
 addpage( [[ 'PV Capital Costs' ], [ 'PV Capital Cost Curve', 'PV Capex Table', 'PV Capex Table AC', 'PV Capex Table Land' ]], { 'sidebar'='PV Installation Costs', 'exclusive_var'='pv_capex_cost_choice','help'='cc_pv', 'bin_name'='PVWatts'} );
 addpage( [[ 'Operating Costs', 'Operating Costs Land Lease' ]], {'sidebar' = 'PV Operating Costs', 'help'='oc_operating', 'bin_name'='PVWatts'} );
-addpage( [[ 'Financial Tax Credits','Financial Cash Incentives']], { 'sidebar'='PV Incentives', 'help'='incentives', 'bin_name'='PVWatts' } );
+//addpage( [[ 'Financial Tax Credits','Financial Cash Incentives']], { 'sidebar'='PV Incentives', 'help'='incentives', 'bin_name'='PVWatts' } );
 // wind
 addpage( [[ 'Wind Resource File'], [ 'Wind Speed Weibull Distribution'], [ 'Wind Resource Probability Table']], { 'sidebar'='Wind Resource', 'exclusive_var'='wind_resource_model_choice', 'help'='wind_resource', 'bin_name'='Wind' } );
 addpage( [[ 'Wind Turbine Design' ]], { 'sidebar'='Wind Turbine', 'help'='wind_turbine', 'bin_name'='Wind' } );
@@ -2560,12 +2560,12 @@ addpage( [[ 'Wind Losses' ]], { 'sidebar'='Wind Losses', 'help'='wind_losses', '
 addpage( [[ 'Degradation AC Single Year'] ], { 'sidebar'='Wind Degradation','help'='lifetime', 'bin_name'='Wind'} );
 addpage( [[ 'Wind Farm Costs']], { 'sidebar'='Wind Installation Costs', 'help'='cc_wind', 'bin_name'='Wind' } );
 addpage( [[ 'Operating Costs' ]], {'sidebar' = 'Wind Operating Costs', 'help'='oc_operating', 'bin_name'='Wind'} );
-addpage( [[ 'Financial Tax Credits','Financial Cash Incentives']], { 'sidebar'='Wind Incentives', 'help'='incentives', 'bin_name'='Wind' } );
+//addpage( [[ 'Financial Tax Credits','Financial Cash Incentives']], { 'sidebar'='Wind Incentives', 'help'='incentives', 'bin_name'='Wind' } );
 // battery
 setup_hybrid_battery_pages(FOM);
 addpage( [[ 'Standalone Battery Costs', 'Battery Enable' ]], { 'sidebar'='Battery Installation Costs', 'help'='cc_standalone_battery', 'bin_name'='Battery' } );
 addpage( [[ 'Operating Costs Standalone Battery']], { 'sidebar'='Battery Operating Costs', 'help'='oc_battery', 'bin_name'='Battery' } );
-addpage( [[ 'Financial Tax Credits','Financial Cash Incentives']], { 'sidebar'='Battery Incentives', 'help'='incentives', 'bin_name'='Battery' } );
+//addpage( [[ 'Financial Tax Credits','Financial Cash Incentives']], { 'sidebar'='Battery Incentives', 'help'='incentives', 'bin_name'='Battery' } );
 // single owner
 setup_single_owner_pages( );
 setup_electricity_purchases();
@@ -2606,7 +2606,7 @@ addpage( [[ 'PVWatts', {'name'='PV Land Area', 'caption' = 'Land Area', 'collaps
 addpage( [[ 'Degradation AC Single Year'], ], { 'sidebar'='PV Degradation','help'='degradation', 'bin_name'='PVWatts' } );
 addpage( [[ 'PV Capital Costs' ], [ 'PV Capital Cost Curve', 'PV Capex Table', 'PV Capex Table AC', 'PV Capex Table Land' ]], { 'sidebar'='PV Installation Costs', 'exclusive_var'='pv_capex_cost_choice','help'='cc_pv', 'bin_name'='PVWatts'} );
 addpage( [[ 'Operating Costs', 'Operating Costs Land Lease' ]], {'sidebar' = 'PV Operating Costs', 'help'='oc_operating', 'bin_name'='PVWatts'} );
-addpage( [[ 'Financial Tax Credits','Financial Cash Incentives']], { 'sidebar'='PV Incentives', 'help'='incentives', 'bin_name'='PVWatts' } );
+//addpage( [[ 'Financial Tax Credits','Financial Cash Incentives']], { 'sidebar'='PV Incentives', 'help'='incentives', 'bin_name'='PVWatts' } );
 // wind
 addpage( [[ 'Wind Resource File'], [ 'Wind Speed Weibull Distribution'], [ 'Wind Resource Probability Table']], { 'sidebar'='Wind Resource', 'exclusive_var'='wind_resource_model_choice', 'help'='wind_resource', 'bin_name'='Wind' } );
 addpage( [[ 'Wind Turbine Design' ]], { 'sidebar'='Wind Turbine', 'help'='wind_turbine', 'bin_name'='Wind' } );
@@ -2615,12 +2615,12 @@ addpage( [[ 'Wind Losses' ]], { 'sidebar'='Wind Losses', 'help'='wind_losses', '
 addpage( [[ 'Degradation AC Single Year'] ], { 'sidebar'='Wind Degradation','help'='lifetime', 'bin_name'='Wind'} );
 addpage( [[ 'Wind Farm Costs']], { 'sidebar'='Wind Installation Costs', 'help'='cc_wind', 'bin_name'='Wind' } );
 addpage( [[ 'Operating Costs' ]], {'sidebar' = 'Wind Operating Costs', 'help'='oc_operating', 'bin_name'='Wind'} );
-addpage( [[ 'Financial Tax Credits','Financial Cash Incentives']], { 'sidebar'='Wind Incentives', 'help'='incentives', 'bin_name'='Wind' } );
+//addpage( [[ 'Financial Tax Credits','Financial Cash Incentives']], { 'sidebar'='Wind Incentives', 'help'='incentives', 'bin_name'='Wind' } );
 // battery
 setup_hybrid_battery_pages(BTM);
 addpage( [[ 'Standalone Battery Costs', 'Battery Enable' ]],{ 'sidebar'='Battery Installation Costs', 'help'='cc_standalone_battery', 'bin_name'='Battery' } );
 addpage( [[ 'Operating Costs Standalone Battery']],{ 'sidebar'='Battery Operating Costs', 'help'='oc_battery', 'bin_name'='Battery' } );
-addpage( [[ 'Financial Tax Credits','Financial Cash Incentives']], { 'sidebar'='Battery Incentives', 'help'='incentives', 'bin_name'='Battery' } );
+//addpage( [[ 'Financial Tax Credits','Financial Cash Incentives']], { 'sidebar'='Battery Incentives', 'help'='incentives', 'bin_name'='Battery' } );
 // host developer
 setup_host_developer_pages(LOAD_SIMPLE);
 addpage([['Hybrid Summary']], {'sidebar'='Hybrid Summary', 'help'='hybrid_summary'});