diff --git a/modules/Geothermal.c b/modules/Geothermal.c
index eb97f05..b6fcebc 100644
--- a/modules/Geothermal.c
+++ b/modules/Geothermal.c
@@ -1013,18 +1013,6 @@ GeoHourly_set_stim_success_rate(VarGroupObject *self, PyObject *value, void *clo
 	return PySAM_double_setter(value, SAM_Geothermal_GeoHourly_stim_success_rate_nset, self->data_ptr);
 }
 
-static PyObject *
-GeoHourly_get_stimulation_type(VarGroupObject *self, void *closure)
-{
-	return PySAM_double_getter(SAM_Geothermal_GeoHourly_stimulation_type_nget, self->data_ptr);
-}
-
-static int
-GeoHourly_set_stimulation_type(VarGroupObject *self, PyObject *value, void *closure)
-{
-	return PySAM_double_setter(value, SAM_Geothermal_GeoHourly_stimulation_type_nset, self->data_ptr);
-}
-
 static PyObject *
 GeoHourly_get_subsurface_water_loss(VarGroupObject *self, void *closure)
 {
@@ -1356,9 +1344,6 @@ static PyGetSetDef GeoHourly_getset[] = {
 {"stim_success_rate", (getter)GeoHourly_get_stim_success_rate,(setter)GeoHourly_set_stim_success_rate,
 	PyDoc_STR("*float*: Stimulation success rate [%]\n\nThe value of the following variables depends on ``stim_success_rate``:\n\n\t - num_wells_getem\n"),
  	NULL},
-{"stimulation_type", (getter)GeoHourly_get_stimulation_type,(setter)GeoHourly_set_stimulation_type,
-	PyDoc_STR("*float*: Which wells are stimulated [0/1/2/3]\n\n**Options:**\n0=Injection,1=Production,2=Both,3=Neither\n\n**Required:**\nFalse. Automatically set to 3 if not assigned explicitly or loaded from defaults."),
- 	NULL},
 {"subsurface_water_loss", (getter)GeoHourly_get_subsurface_water_loss,(setter)GeoHourly_set_subsurface_water_loss,
 	PyDoc_STR("*float*: Subsurface water loss [%]\n\n**Required:**\nTrue\n\nThe value of the following variables depends on ``subsurface_water_loss``:\n\n\t - num_wells_getem\n"),
  	NULL},
@@ -1660,30 +1645,12 @@ Outputs_get_num_wells_getem_inj(VarGroupObject *self, void *closure)
 	return PySAM_double_getter(SAM_Geothermal_Outputs_num_wells_getem_inj_nget, self->data_ptr);
 }
 
-static PyObject *
-Outputs_get_num_wells_getem_inj_drilled(VarGroupObject *self, void *closure)
-{
-	return PySAM_double_getter(SAM_Geothermal_Outputs_num_wells_getem_inj_drilled_nget, self->data_ptr);
-}
-
 static PyObject *
 Outputs_get_num_wells_getem_output(VarGroupObject *self, void *closure)
 {
 	return PySAM_double_getter(SAM_Geothermal_Outputs_num_wells_getem_output_nget, self->data_ptr);
 }
 
-static PyObject *
-Outputs_get_num_wells_getem_prod_drilled(VarGroupObject *self, void *closure)
-{
-	return PySAM_double_getter(SAM_Geothermal_Outputs_num_wells_getem_prod_drilled_nget, self->data_ptr);
-}
-
-static PyObject *
-Outputs_get_num_wells_getem_prod_failed(VarGroupObject *self, void *closure)
-{
-	return PySAM_double_getter(SAM_Geothermal_Outputs_num_wells_getem_prod_failed_nget, self->data_ptr);
-}
-
 static PyObject *
 Outputs_get_plant_brine_eff(VarGroupObject *self, void *closure)
 {
@@ -1941,19 +1908,10 @@ static PyGetSetDef Outputs_getset[] = {
 	PyDoc_STR("*float*: Condensate Pump Work [kW]"),
  	NULL},
 {"num_wells_getem_inj", (getter)Outputs_get_num_wells_getem_inj,(setter)0,
-	PyDoc_STR("*float*: Number of required injection wells calculated by GETEM"),
- 	NULL},
-{"num_wells_getem_inj_drilled", (getter)Outputs_get_num_wells_getem_inj_drilled,(setter)0,
-	PyDoc_STR("*float*: Number of injection wells drilled"),
+	PyDoc_STR("*float*: Number of wells calculated by GETEM"),
  	NULL},
 {"num_wells_getem_output", (getter)Outputs_get_num_wells_getem_output,(setter)0,
-	PyDoc_STR("*float*: Number of production wells required"),
- 	NULL},
-{"num_wells_getem_prod_drilled", (getter)Outputs_get_num_wells_getem_prod_drilled,(setter)0,
-	PyDoc_STR("*float*: Number of production wells drilled"),
- 	NULL},
-{"num_wells_getem_prod_failed", (getter)Outputs_get_num_wells_getem_prod_failed,(setter)0,
-	PyDoc_STR("*float*: Number of production wells failed during drilling"),
+	PyDoc_STR("*float*: Number of wells calculated by GETEM"),
  	NULL},
 {"plant_brine_eff", (getter)Outputs_get_plant_brine_eff,(setter)0,
 	PyDoc_STR("*float*: Plant Brine Efficiency"),
diff --git a/modules/GeothermalCosts.c b/modules/GeothermalCosts.c
index 35f483b..9101d0c 100644
--- a/modules/GeothermalCosts.c
+++ b/modules/GeothermalCosts.c
@@ -5,8 +5,6 @@
 
 #include "PySAM_utils.h"
 
-#include "GeothermalCosts_eqns.c"
-
 
 /*
  * GeoHourly Group
@@ -211,78 +209,6 @@ GeoHourly_set_flash_count(VarGroupObject *self, PyObject *value, void *closure)
 	return PySAM_double_setter(value, SAM_GeothermalCosts_GeoHourly_flash_count_nset, self->data_ptr);
 }
 
-static PyObject *
-GeoHourly_get_geotherm_cost_conf_multiplier(VarGroupObject *self, void *closure)
-{
-	return PySAM_double_getter(SAM_GeothermalCosts_GeoHourly_geotherm_cost_conf_multiplier_nget, self->data_ptr);
-}
-
-static int
-GeoHourly_set_geotherm_cost_conf_multiplier(VarGroupObject *self, PyObject *value, void *closure)
-{
-	return PySAM_double_setter(value, SAM_GeothermalCosts_GeoHourly_geotherm_cost_conf_multiplier_nset, self->data_ptr);
-}
-
-static PyObject *
-GeoHourly_get_geotherm_cost_conf_non_drill(VarGroupObject *self, void *closure)
-{
-	return PySAM_double_getter(SAM_GeothermalCosts_GeoHourly_geotherm_cost_conf_non_drill_nget, self->data_ptr);
-}
-
-static int
-GeoHourly_set_geotherm_cost_conf_non_drill(VarGroupObject *self, PyObject *value, void *closure)
-{
-	return PySAM_double_setter(value, SAM_GeothermalCosts_GeoHourly_geotherm_cost_conf_non_drill_nset, self->data_ptr);
-}
-
-static PyObject *
-GeoHourly_get_geotherm_cost_conf_num_wells(VarGroupObject *self, void *closure)
-{
-	return PySAM_double_getter(SAM_GeothermalCosts_GeoHourly_geotherm_cost_conf_num_wells_nget, self->data_ptr);
-}
-
-static int
-GeoHourly_set_geotherm_cost_conf_num_wells(VarGroupObject *self, PyObject *value, void *closure)
-{
-	return PySAM_double_setter(value, SAM_GeothermalCosts_GeoHourly_geotherm_cost_conf_num_wells_nset, self->data_ptr);
-}
-
-static PyObject *
-GeoHourly_get_geotherm_cost_expl_multiplier(VarGroupObject *self, void *closure)
-{
-	return PySAM_double_getter(SAM_GeothermalCosts_GeoHourly_geotherm_cost_expl_multiplier_nget, self->data_ptr);
-}
-
-static int
-GeoHourly_set_geotherm_cost_expl_multiplier(VarGroupObject *self, PyObject *value, void *closure)
-{
-	return PySAM_double_setter(value, SAM_GeothermalCosts_GeoHourly_geotherm_cost_expl_multiplier_nset, self->data_ptr);
-}
-
-static PyObject *
-GeoHourly_get_geotherm_cost_expl_non_drill(VarGroupObject *self, void *closure)
-{
-	return PySAM_double_getter(SAM_GeothermalCosts_GeoHourly_geotherm_cost_expl_non_drill_nget, self->data_ptr);
-}
-
-static int
-GeoHourly_set_geotherm_cost_expl_non_drill(VarGroupObject *self, PyObject *value, void *closure)
-{
-	return PySAM_double_setter(value, SAM_GeothermalCosts_GeoHourly_geotherm_cost_expl_non_drill_nset, self->data_ptr);
-}
-
-static PyObject *
-GeoHourly_get_geotherm_cost_expl_num_wells(VarGroupObject *self, void *closure)
-{
-	return PySAM_double_getter(SAM_GeothermalCosts_GeoHourly_geotherm_cost_expl_num_wells_nget, self->data_ptr);
-}
-
-static int
-GeoHourly_set_geotherm_cost_expl_num_wells(VarGroupObject *self, PyObject *value, void *closure)
-{
-	return PySAM_double_setter(value, SAM_GeothermalCosts_GeoHourly_geotherm_cost_expl_num_wells_nset, self->data_ptr);
-}
-
 static PyObject *
 GeoHourly_get_geotherm_cost_inj_cost_curve(VarGroupObject *self, void *closure)
 {
@@ -319,6 +245,18 @@ GeoHourly_set_geotherm_cost_inj_cost_curve_welltype(VarGroupObject *self, PyObje
 	return PySAM_double_setter(value, SAM_GeothermalCosts_GeoHourly_geotherm_cost_inj_cost_curve_welltype_nset, self->data_ptr);
 }
 
+static PyObject *
+GeoHourly_get_geotherm_cost_inj_wells_drilled(VarGroupObject *self, void *closure)
+{
+	return PySAM_double_getter(SAM_GeothermalCosts_GeoHourly_geotherm_cost_inj_wells_drilled_nget, self->data_ptr);
+}
+
+static int
+GeoHourly_set_geotherm_cost_inj_wells_drilled(VarGroupObject *self, PyObject *value, void *closure)
+{
+	return PySAM_double_setter(value, SAM_GeothermalCosts_GeoHourly_geotherm_cost_inj_wells_drilled_nset, self->data_ptr);
+}
+
 static PyObject *
 GeoHourly_get_geotherm_cost_prod_cost_curve(VarGroupObject *self, void *closure)
 {
@@ -356,63 +294,15 @@ GeoHourly_set_geotherm_cost_prod_cost_curve_welltype(VarGroupObject *self, PyObj
 }
 
 static PyObject *
-GeoHourly_get_geotherm_cost_prod_req(VarGroupObject *self, void *closure)
-{
-	return PySAM_double_getter(SAM_GeothermalCosts_GeoHourly_geotherm_cost_prod_req_nget, self->data_ptr);
-}
-
-static int
-GeoHourly_set_geotherm_cost_prod_req(VarGroupObject *self, PyObject *value, void *closure)
-{
-	return PySAM_double_setter(value, SAM_GeothermalCosts_GeoHourly_geotherm_cost_prod_req_nset, self->data_ptr);
-}
-
-static PyObject *
-GeoHourly_get_geotherm_cost_pump_depth(VarGroupObject *self, void *closure)
-{
-	return PySAM_double_getter(SAM_GeothermalCosts_GeoHourly_geotherm_cost_pump_depth_nget, self->data_ptr);
-}
-
-static int
-GeoHourly_set_geotherm_cost_pump_depth(VarGroupObject *self, PyObject *value, void *closure)
-{
-	return PySAM_double_setter(value, SAM_GeothermalCosts_GeoHourly_geotherm_cost_pump_depth_nset, self->data_ptr);
-}
-
-static PyObject *
-GeoHourly_get_geotherm_cost_pump_fixed(VarGroupObject *self, void *closure)
-{
-	return PySAM_double_getter(SAM_GeothermalCosts_GeoHourly_geotherm_cost_pump_fixed_nget, self->data_ptr);
-}
-
-static int
-GeoHourly_set_geotherm_cost_pump_fixed(VarGroupObject *self, PyObject *value, void *closure)
-{
-	return PySAM_double_setter(value, SAM_GeothermalCosts_GeoHourly_geotherm_cost_pump_fixed_nset, self->data_ptr);
-}
-
-static PyObject *
-GeoHourly_get_geotherm_cost_pump_per_foot(VarGroupObject *self, void *closure)
+GeoHourly_get_geotherm_cost_prod_wells_drilled(VarGroupObject *self, void *closure)
 {
-	return PySAM_double_getter(SAM_GeothermalCosts_GeoHourly_geotherm_cost_pump_per_foot_nget, self->data_ptr);
+	return PySAM_double_getter(SAM_GeothermalCosts_GeoHourly_geotherm_cost_prod_wells_drilled_nget, self->data_ptr);
 }
 
 static int
-GeoHourly_set_geotherm_cost_pump_per_foot(VarGroupObject *self, PyObject *value, void *closure)
+GeoHourly_set_geotherm_cost_prod_wells_drilled(VarGroupObject *self, PyObject *value, void *closure)
 {
-	return PySAM_double_setter(value, SAM_GeothermalCosts_GeoHourly_geotherm_cost_pump_per_foot_nset, self->data_ptr);
-}
-
-static PyObject *
-GeoHourly_get_geotherm_cost_stim_non_drill(VarGroupObject *self, void *closure)
-{
-	return PySAM_double_getter(SAM_GeothermalCosts_GeoHourly_geotherm_cost_stim_non_drill_nget, self->data_ptr);
-}
-
-static int
-GeoHourly_set_geotherm_cost_stim_non_drill(VarGroupObject *self, PyObject *value, void *closure)
-{
-	return PySAM_double_setter(value, SAM_GeothermalCosts_GeoHourly_geotherm_cost_stim_non_drill_nset, self->data_ptr);
+	return PySAM_double_setter(value, SAM_GeothermalCosts_GeoHourly_geotherm_cost_prod_wells_drilled_nset, self->data_ptr);
 }
 
 static PyObject *
@@ -451,30 +341,6 @@ GeoHourly_set_hp_flash_pressure(VarGroupObject *self, PyObject *value, void *clo
 	return PySAM_double_setter(value, SAM_GeothermalCosts_GeoHourly_hp_flash_pressure_nset, self->data_ptr);
 }
 
-static PyObject *
-GeoHourly_get_inj_num_pumps(VarGroupObject *self, void *closure)
-{
-	return PySAM_double_getter(SAM_GeothermalCosts_GeoHourly_inj_num_pumps_nget, self->data_ptr);
-}
-
-static int
-GeoHourly_set_inj_num_pumps(VarGroupObject *self, PyObject *value, void *closure)
-{
-	return PySAM_double_setter(value, SAM_GeothermalCosts_GeoHourly_inj_num_pumps_nset, self->data_ptr);
-}
-
-static PyObject *
-GeoHourly_get_inj_pump_hp(VarGroupObject *self, void *closure)
-{
-	return PySAM_double_getter(SAM_GeothermalCosts_GeoHourly_inj_pump_hp_nget, self->data_ptr);
-}
-
-static int
-GeoHourly_set_inj_pump_hp(VarGroupObject *self, PyObject *value, void *closure)
-{
-	return PySAM_double_setter(value, SAM_GeothermalCosts_GeoHourly_inj_pump_hp_nset, self->data_ptr);
-}
-
 static PyObject *
 GeoHourly_get_lp_flash_pressure(VarGroupObject *self, void *closure)
 {
@@ -499,42 +365,6 @@ GeoHourly_set_ncg_condensate_pump(VarGroupObject *self, PyObject *value, void *c
 	return PySAM_double_setter(value, SAM_GeothermalCosts_GeoHourly_ncg_condensate_pump_nset, self->data_ptr);
 }
 
-static PyObject *
-GeoHourly_get_num_wells_getem_inj_drilled(VarGroupObject *self, void *closure)
-{
-	return PySAM_double_getter(SAM_GeothermalCosts_GeoHourly_num_wells_getem_inj_drilled_nget, self->data_ptr);
-}
-
-static int
-GeoHourly_set_num_wells_getem_inj_drilled(VarGroupObject *self, PyObject *value, void *closure)
-{
-	return PySAM_double_setter(value, SAM_GeothermalCosts_GeoHourly_num_wells_getem_inj_drilled_nset, self->data_ptr);
-}
-
-static PyObject *
-GeoHourly_get_num_wells_getem_prod_drilled(VarGroupObject *self, void *closure)
-{
-	return PySAM_double_getter(SAM_GeothermalCosts_GeoHourly_num_wells_getem_prod_drilled_nget, self->data_ptr);
-}
-
-static int
-GeoHourly_set_num_wells_getem_prod_drilled(VarGroupObject *self, PyObject *value, void *closure)
-{
-	return PySAM_double_setter(value, SAM_GeothermalCosts_GeoHourly_num_wells_getem_prod_drilled_nset, self->data_ptr);
-}
-
-static PyObject *
-GeoHourly_get_num_wells_getem_prod_failed(VarGroupObject *self, void *closure)
-{
-	return PySAM_double_getter(SAM_GeothermalCosts_GeoHourly_num_wells_getem_prod_failed_nget, self->data_ptr);
-}
-
-static int
-GeoHourly_set_num_wells_getem_prod_failed(VarGroupObject *self, PyObject *value, void *closure)
-{
-	return PySAM_double_setter(value, SAM_GeothermalCosts_GeoHourly_num_wells_getem_prod_failed_nset, self->data_ptr);
-}
-
 static PyObject *
 GeoHourly_get_ppi_base_year(VarGroupObject *self, void *closure)
 {
@@ -583,18 +413,6 @@ GeoHourly_set_pressure_ratio_3(VarGroupObject *self, PyObject *value, void *clos
 	return PySAM_double_setter(value, SAM_GeothermalCosts_GeoHourly_pressure_ratio_3_nset, self->data_ptr);
 }
 
-static PyObject *
-GeoHourly_get_pump_size_hp(VarGroupObject *self, void *closure)
-{
-	return PySAM_double_getter(SAM_GeothermalCosts_GeoHourly_pump_size_hp_nget, self->data_ptr);
-}
-
-static int
-GeoHourly_set_pump_size_hp(VarGroupObject *self, PyObject *value, void *closure)
-{
-	return PySAM_double_setter(value, SAM_GeothermalCosts_GeoHourly_pump_size_hp_nset, self->data_ptr);
-}
-
 static PyObject *
 GeoHourly_get_qCondenser(VarGroupObject *self, void *closure)
 {
@@ -785,24 +603,6 @@ static PyGetSetDef GeoHourly_getset[] = {
 {"flash_count", (getter)GeoHourly_get_flash_count,(setter)GeoHourly_set_flash_count,
 	PyDoc_STR("*float*: Flash Count [(1 -2)]\n\n**Required:**\nRequired if conversion_type=1"),
  	NULL},
-{"geotherm_cost_conf_multiplier", (getter)GeoHourly_get_geotherm_cost_conf_multiplier,(setter)GeoHourly_set_geotherm_cost_conf_multiplier,
-	PyDoc_STR("*float*: Confirmation cost multiplier\n\n**Required:**\nRequired if calc_drill_costs=1"),
- 	NULL},
-{"geotherm_cost_conf_non_drill", (getter)GeoHourly_get_geotherm_cost_conf_non_drill,(setter)GeoHourly_set_geotherm_cost_conf_non_drill,
-	PyDoc_STR("*float*: Confirmation non drilling costs [$]\n\n**Required:**\nRequired if calc_drill_costs=1"),
- 	NULL},
-{"geotherm_cost_conf_num_wells", (getter)GeoHourly_get_geotherm_cost_conf_num_wells,(setter)GeoHourly_set_geotherm_cost_conf_num_wells,
-	PyDoc_STR("*float*: Number of confirmation wells\n\n**Required:**\nRequired if calc_drill_costs=1"),
- 	NULL},
-{"geotherm_cost_expl_multiplier", (getter)GeoHourly_get_geotherm_cost_expl_multiplier,(setter)GeoHourly_set_geotherm_cost_expl_multiplier,
-	PyDoc_STR("*float*: Exploration cost multiplier\n\n**Required:**\nRequired if calc_drill_costs=1"),
- 	NULL},
-{"geotherm_cost_expl_non_drill", (getter)GeoHourly_get_geotherm_cost_expl_non_drill,(setter)GeoHourly_set_geotherm_cost_expl_non_drill,
-	PyDoc_STR("*float*: Exploration non drilling costs [$]\n\n**Required:**\nRequired if calc_drill_costs=1"),
- 	NULL},
-{"geotherm_cost_expl_num_wells", (getter)GeoHourly_get_geotherm_cost_expl_num_wells,(setter)GeoHourly_set_geotherm_cost_expl_num_wells,
-	PyDoc_STR("*float*: Number of exploration wells\n\n**Required:**\nRequired if calc_drill_costs=1"),
- 	NULL},
 {"geotherm_cost_inj_cost_curve", (getter)GeoHourly_get_geotherm_cost_inj_cost_curve,(setter)GeoHourly_set_geotherm_cost_inj_cost_curve,
 	PyDoc_STR("*float*: Injection well diameter type [0/1]\n\n**Options:**\n0=LargerDiameter,1=SmallerDiameter\n\n**Required:**\nRequired if calc_drill_costs=1"),
  	NULL},
@@ -812,6 +612,9 @@ static PyGetSetDef GeoHourly_getset[] = {
 {"geotherm_cost_inj_cost_curve_welltype", (getter)GeoHourly_get_geotherm_cost_inj_cost_curve_welltype,(setter)GeoHourly_set_geotherm_cost_inj_cost_curve_welltype,
 	PyDoc_STR("*float*: Injection well type [0/1]\n\n**Required:**\nRequired if calc_drill_costs=1"),
  	NULL},
+{"geotherm_cost_inj_wells_drilled", (getter)GeoHourly_get_geotherm_cost_inj_wells_drilled,(setter)GeoHourly_set_geotherm_cost_inj_wells_drilled,
+	PyDoc_STR("*float*: Number of drilled injection wells [0/1]\n\n**Options:**\n0=LargerDiameter,1=SmallerDiameter\n\n**Required:**\nRequired if calc_drill_costs=1"),
+ 	NULL},
 {"geotherm_cost_prod_cost_curve", (getter)GeoHourly_get_geotherm_cost_prod_cost_curve,(setter)GeoHourly_set_geotherm_cost_prod_cost_curve,
 	PyDoc_STR("*float*: Production well diameter type [0/1]\n\n**Options:**\n0=LargerDiameter,1=SmallerDiameter\n\n**Required:**\nRequired if calc_drill_costs=1"),
  	NULL},
@@ -821,20 +624,8 @@ static PyGetSetDef GeoHourly_getset[] = {
 {"geotherm_cost_prod_cost_curve_welltype", (getter)GeoHourly_get_geotherm_cost_prod_cost_curve_welltype,(setter)GeoHourly_set_geotherm_cost_prod_cost_curve_welltype,
 	PyDoc_STR("*float*: Production well type [0/1]\n\n**Required:**\nRequired if calc_drill_costs=1"),
  	NULL},
-{"geotherm_cost_prod_req", (getter)GeoHourly_get_geotherm_cost_prod_req,(setter)GeoHourly_set_geotherm_cost_prod_req,
-	PyDoc_STR("*float*: Number of production wells required"),
- 	NULL},
-{"geotherm_cost_pump_depth", (getter)GeoHourly_get_geotherm_cost_pump_depth,(setter)GeoHourly_set_geotherm_cost_pump_depth,
-	PyDoc_STR("*float*: Pump depth [ft]"),
- 	NULL},
-{"geotherm_cost_pump_fixed", (getter)GeoHourly_get_geotherm_cost_pump_fixed,(setter)GeoHourly_set_geotherm_cost_pump_fixed,
-	PyDoc_STR("*float*: Fixed pump workover and casing cost [$]"),
- 	NULL},
-{"geotherm_cost_pump_per_foot", (getter)GeoHourly_get_geotherm_cost_pump_per_foot,(setter)GeoHourly_set_geotherm_cost_pump_per_foot,
-	PyDoc_STR("*float*: Pump cost per foot [$/ft]"),
- 	NULL},
-{"geotherm_cost_stim_non_drill", (getter)GeoHourly_get_geotherm_cost_stim_non_drill,(setter)GeoHourly_set_geotherm_cost_stim_non_drill,
-	PyDoc_STR("*float*: Stimulation non drilling costs [$]\n\n**Required:**\nRequired if calc_drill_costs=1"),
+{"geotherm_cost_prod_wells_drilled", (getter)GeoHourly_get_geotherm_cost_prod_wells_drilled,(setter)GeoHourly_set_geotherm_cost_prod_wells_drilled,
+	PyDoc_STR("*float*: Number of drilled production wells [0/1]\n\n**Options:**\n0=LargerDiameter,1=SmallerDiameter\n\n**Required:**\nRequired if calc_drill_costs=1"),
  	NULL},
 {"gross_cost_output", (getter)GeoHourly_get_gross_cost_output,(setter)GeoHourly_set_gross_cost_output,
 	PyDoc_STR("*float*: Gross output from GETEM for cost calculations [MW]\n\n**Required:**\nTrue"),
@@ -845,27 +636,12 @@ static PyGetSetDef GeoHourly_getset[] = {
 {"hp_flash_pressure", (getter)GeoHourly_get_hp_flash_pressure,(setter)GeoHourly_set_hp_flash_pressure,
 	PyDoc_STR("*float*: HP Flash Pressure [psia]\n\n**Required:**\nRequired if conversion_type=1"),
  	NULL},
-{"inj_num_pumps", (getter)GeoHourly_get_inj_num_pumps,(setter)GeoHourly_set_inj_num_pumps,
-	PyDoc_STR("*float*: Number of injection pumps [p]"),
- 	NULL},
-{"inj_pump_hp", (getter)GeoHourly_get_inj_pump_hp,(setter)GeoHourly_set_inj_pump_hp,
-	PyDoc_STR("*float*: Injection pump power [hp]"),
- 	NULL},
 {"lp_flash_pressure", (getter)GeoHourly_get_lp_flash_pressure,(setter)GeoHourly_set_lp_flash_pressure,
 	PyDoc_STR("*float*: LP Flash Pressure [psia]\n\n**Required:**\nRequired if conversion_type=1"),
  	NULL},
 {"ncg_condensate_pump", (getter)GeoHourly_get_ncg_condensate_pump,(setter)GeoHourly_set_ncg_condensate_pump,
 	PyDoc_STR("*float*: Condensate Pump Work [kW]\n\n**Required:**\nRequired if conversion_type=1"),
  	NULL},
-{"num_wells_getem_inj_drilled", (getter)GeoHourly_get_num_wells_getem_inj_drilled,(setter)GeoHourly_set_num_wells_getem_inj_drilled,
-	PyDoc_STR("*float*: Number of drilled injection wells [0/1]\n\n**Options:**\n0=LargerDiameter,1=SmallerDiameter"),
- 	NULL},
-{"num_wells_getem_prod_drilled", (getter)GeoHourly_get_num_wells_getem_prod_drilled,(setter)GeoHourly_set_num_wells_getem_prod_drilled,
-	PyDoc_STR("*float*: Number of drilled production wells [0/1]\n\n**Options:**\n0=LargerDiameter,1=SmallerDiameter"),
- 	NULL},
-{"num_wells_getem_prod_failed", (getter)GeoHourly_get_num_wells_getem_prod_failed,(setter)GeoHourly_set_num_wells_getem_prod_failed,
-	PyDoc_STR("*float*: Number of failed production wells [0/1]\n\n**Options:**\n0=LargerDiameter,1=SmallerDiameter"),
- 	NULL},
 {"ppi_base_year", (getter)GeoHourly_get_ppi_base_year,(setter)GeoHourly_set_ppi_base_year,
 	PyDoc_STR("*float*: PPI Base Year\n\n**Required:**\nFalse. Automatically set to 19 if not assigned explicitly or loaded from defaults."),
  	NULL},
@@ -878,9 +654,6 @@ static PyGetSetDef GeoHourly_getset[] = {
 {"pressure_ratio_3", (getter)GeoHourly_get_pressure_ratio_3,(setter)GeoHourly_set_pressure_ratio_3,
 	PyDoc_STR("*float*: Suction Steam Ratio 3\n\n**Required:**\nRequired if conversion_type=1"),
  	NULL},
-{"pump_size_hp", (getter)GeoHourly_get_pump_size_hp,(setter)GeoHourly_set_pump_size_hp,
-	PyDoc_STR("*float*: Production pump power [hp]"),
- 	NULL},
 {"qCondenser", (getter)GeoHourly_get_qCondenser,(setter)GeoHourly_set_qCondenser,
 	PyDoc_STR("*float*: Condenser Heat Rejected [btu/h]\n\n**Required:**\nRequired if conversion_type=1"),
  	NULL},
@@ -1047,18 +820,6 @@ Outputs_get_baseline_cost(VarGroupObject *self, void *closure)
 	return PySAM_double_getter(SAM_GeothermalCosts_Outputs_baseline_cost_nget, self->data_ptr);
 }
 
-static PyObject *
-Outputs_get_conf_total_cost(VarGroupObject *self, void *closure)
-{
-	return PySAM_double_getter(SAM_GeothermalCosts_Outputs_conf_total_cost_nget, self->data_ptr);
-}
-
-static PyObject *
-Outputs_get_expl_total_cost(VarGroupObject *self, void *closure)
-{
-	return PySAM_double_getter(SAM_GeothermalCosts_Outputs_expl_total_cost_nget, self->data_ptr);
-}
-
 static PyObject *
 Outputs_get_inj_total_cost(VarGroupObject *self, void *closure)
 {
@@ -1071,57 +832,15 @@ Outputs_get_prod_total_cost(VarGroupObject *self, void *closure)
 	return PySAM_double_getter(SAM_GeothermalCosts_Outputs_prod_total_cost_nget, self->data_ptr);
 }
 
-static PyObject *
-Outputs_get_stim_total_cost(VarGroupObject *self, void *closure)
-{
-	return PySAM_double_getter(SAM_GeothermalCosts_Outputs_stim_total_cost_nget, self->data_ptr);
-}
-
-static PyObject *
-Outputs_get_total_drilling_cost(VarGroupObject *self, void *closure)
-{
-	return PySAM_double_getter(SAM_GeothermalCosts_Outputs_total_drilling_cost_nget, self->data_ptr);
-}
-
-static PyObject *
-Outputs_get_total_gathering_cost(VarGroupObject *self, void *closure)
-{
-	return PySAM_double_getter(SAM_GeothermalCosts_Outputs_total_gathering_cost_nget, self->data_ptr);
-}
-
-static PyObject *
-Outputs_get_total_pump_cost(VarGroupObject *self, void *closure)
-{
-	return PySAM_double_getter(SAM_GeothermalCosts_Outputs_total_pump_cost_nget, self->data_ptr);
-}
-
 static PyGetSetDef Outputs_getset[] = {
 {"baseline_cost", (getter)Outputs_get_baseline_cost,(setter)0,
-	PyDoc_STR("*float*: Baseline cost [$/kW]"),
- 	NULL},
-{"conf_total_cost", (getter)Outputs_get_conf_total_cost,(setter)0,
-	PyDoc_STR("*float*: Total confirmation well cost [$]"),
- 	NULL},
-{"expl_total_cost", (getter)Outputs_get_expl_total_cost,(setter)0,
-	PyDoc_STR("*float*: Total exploration well cost [$]"),
+	PyDoc_STR("*float*: Baseline Cost [$/kW]"),
  	NULL},
 {"inj_total_cost", (getter)Outputs_get_inj_total_cost,(setter)0,
-	PyDoc_STR("*float*: Total injection well cost [$]"),
+	PyDoc_STR("*float*: Total Injection well cost [$/kW]"),
  	NULL},
 {"prod_total_cost", (getter)Outputs_get_prod_total_cost,(setter)0,
-	PyDoc_STR("*float*: Total production well cost [$]"),
- 	NULL},
-{"stim_total_cost", (getter)Outputs_get_stim_total_cost,(setter)0,
-	PyDoc_STR("*float*: Total stimulation well cost [$]"),
- 	NULL},
-{"total_drilling_cost", (getter)Outputs_get_total_drilling_cost,(setter)0,
-	PyDoc_STR("*float*: Total drilling cost [$]"),
- 	NULL},
-{"total_gathering_cost", (getter)Outputs_get_total_gathering_cost,(setter)0,
-	PyDoc_STR("*float*: Total gathering well cost [$/kW]"),
- 	NULL},
-{"total_pump_cost", (getter)Outputs_get_total_pump_cost,(setter)0,
-	PyDoc_STR("*float*: Total pumping cost [$/kW]"),
+	PyDoc_STR("*float*: Total Production well cost [$/kW]"),
  	NULL},
 	{NULL}  /* Sentinel */
 };
@@ -1300,8 +1019,6 @@ static PyMethodDef GeothermalCosts_methods[] = {
 				PyDoc_STR("unassign(name) -> None\n Unassign a value in any of the variable groups.")},
 		{"get_data_ptr",           (PyCFunction)GeothermalCosts_get_data_ptr,  METH_VARARGS,
 				PyDoc_STR("get_data_ptr() -> Pointer\n Get ssc_data_t pointer")},
-		{"getem_om_cost_calc", (PyCFunction)getem_om_cost_calc, METH_VARARGS | METH_KEYWORDS,
-			getem_om_cost_calc_doc},
 		{NULL,              NULL}           /* sentinel */
 };
 
diff --git a/stubs/stubs/Geothermal.pyi b/stubs/stubs/Geothermal.pyi
index 2fbe274..3c5652a 100644
--- a/stubs/stubs/Geothermal.pyi
+++ b/stubs/stubs/Geothermal.pyi
@@ -112,7 +112,6 @@ class Geothermal(object):
 		startup_frac = float
 		startup_time = float
 		stim_success_rate = float
-		stimulation_type = float
 		subsurface_water_loss = float
 		system_use_lifetime_output = float
 		temp_decline_max = float
@@ -192,10 +191,7 @@ class Geothermal(object):
 		monthly_resource_temperature = tuple
 		ncg_condensate_pump = float
 		num_wells_getem_inj = float
-		num_wells_getem_inj_drilled = float
 		num_wells_getem_output = float
-		num_wells_getem_prod_drilled = float
-		num_wells_getem_prod_failed = float
 		plant_brine_eff = float
 		pressure_ratio_1 = float
 		pressure_ratio_2 = float
diff --git a/stubs/stubs/GeothermalCosts.pyi b/stubs/stubs/GeothermalCosts.pyi
index fc5988f..43591ee 100644
--- a/stubs/stubs/GeothermalCosts.pyi
+++ b/stubs/stubs/GeothermalCosts.pyi
@@ -23,8 +23,6 @@ class GeothermalCosts(object):
 	def __init__(self, *args, **kwargs):
 		pass
 
-	def getem_om_cost_calc(self, args):
-		pass
 	class GeoHourly(object):
 		def assign(self): 
 			pass
@@ -47,38 +45,23 @@ class GeothermalCosts(object):
 		dt_prod_well = float
 		eff_secondlaw = float
 		flash_count = float
-		geotherm_cost_conf_multiplier = float
-		geotherm_cost_conf_non_drill = float
-		geotherm_cost_conf_num_wells = float
-		geotherm_cost_expl_multiplier = float
-		geotherm_cost_expl_non_drill = float
-		geotherm_cost_expl_num_wells = float
 		geotherm_cost_inj_cost_curve = float
 		geotherm_cost_inj_cost_curve_welldiam = float
 		geotherm_cost_inj_cost_curve_welltype = float
+		geotherm_cost_inj_wells_drilled = float
 		geotherm_cost_prod_cost_curve = float
 		geotherm_cost_prod_cost_curve_welldiam = float
 		geotherm_cost_prod_cost_curve_welltype = float
-		geotherm_cost_prod_req = float
-		geotherm_cost_pump_depth = float
-		geotherm_cost_pump_fixed = float
-		geotherm_cost_pump_per_foot = float
-		geotherm_cost_stim_non_drill = float
+		geotherm_cost_prod_wells_drilled = float
 		gross_cost_output = float
 		gross_output = float
 		hp_flash_pressure = float
-		inj_num_pumps = float
-		inj_pump_hp = float
 		lp_flash_pressure = float
 		ncg_condensate_pump = float
-		num_wells_getem_inj_drilled = float
-		num_wells_getem_prod_drilled = float
-		num_wells_getem_prod_failed = float
 		ppi_base_year = float
 		pressure_ratio_1 = float
 		pressure_ratio_2 = float
 		pressure_ratio_3 = float
-		pump_size_hp = float
 		qCondenser = float
 		qRejectByStage_1 = float
 		qRejectByStage_2 = float
@@ -106,14 +89,8 @@ class GeothermalCosts(object):
 
 
 		baseline_cost = float
-		conf_total_cost = float
-		expl_total_cost = float
 		inj_total_cost = float
 		prod_total_cost = float
-		stim_total_cost = float
-		total_drilling_cost = float
-		total_gathering_cost = float
-		total_pump_cost = float