diff --git a/docs/release_notes.rst b/docs/release_notes.rst
index 79943539..ba9d9238 100644
--- a/docs/release_notes.rst
+++ b/docs/release_notes.rst
@@ -11,6 +11,8 @@ Release Notes
 Upcoming Release
 ================
 
+* Removed water-sourced heat pumps, as cost assumptions (based on higher uncertainty range in DEA tables) are a) likely overestimates and b) break pessimistic/optimistic scenarios. Reccomendation: Use excess-heat-sourced heat pump data or see DEA data on seawater-sourced heat pumps.
+
 .. .. warning:: 
   
 ..   The features listed below are not released yet, but will be part of the next release! 
diff --git a/outputs/US/costs_2020.csv b/outputs/US/costs_2020.csv
index 711824cd..61f59613 100644
--- a/outputs/US/costs_2020.csv
+++ b/outputs/US/costs_2020.csv
@@ -3676,11 +3676,6 @@ central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, inputs/techn
 central water tank storage,energy to power ratio,60.3448,h,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Ratio between energy storage and input capacity,2015.0,,
 central water tank storage,investment,3.1374,EUR/kWhCapacity,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Specific investment,2015.0,,
 central water tank storage,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Technical lifetime,2015.0,,
-central water-sourced heat pump,FOM,0.5,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Fixed O&M",2015.0,,
-central water-sourced heat pump,VOM,1.8942,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Variable O&M",2015.0,,
-central water-sourced heat pump,efficiency,3.78,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Total efficiency , net, annual average",2015.0,,
-central water-sourced heat pump,investment,1058.2216,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Specific investment",2015.0,,
-central water-sourced heat pump,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Technical lifetime",2015.0,,
 clean water tank storage,FOM,2.0,%/year,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0,,
 clean water tank storage,investment,69.1286,EUR/m^3-H2O,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0,,
 clean water tank storage,lifetime,30.0,years,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,,,
diff --git a/outputs/US/costs_2025.csv b/outputs/US/costs_2025.csv
index 4a619f18..e19bc6c0 100644
--- a/outputs/US/costs_2025.csv
+++ b/outputs/US/costs_2025.csv
@@ -3756,11 +3756,6 @@ central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, inputs/techn
 central water tank storage,energy to power ratio,60.3448,h,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Ratio between energy storage and input capacity,2015.0,,
 central water tank storage,investment,3.1374,EUR/kWhCapacity,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Specific investment,2015.0,,
 central water tank storage,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Technical lifetime,2015.0,,
-central water-sourced heat pump,FOM,0.5,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Fixed O&M",2015.0,,
-central water-sourced heat pump,VOM,1.7884,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Variable O&M",2015.0,,
-central water-sourced heat pump,efficiency,3.8,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Total efficiency , net, annual average",2015.0,,
-central water-sourced heat pump,investment,1058.2216,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Specific investment",2015.0,,
-central water-sourced heat pump,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Technical lifetime",2015.0,,
 clean water tank storage,FOM,2.0,%/year,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0,,
 clean water tank storage,investment,69.1286,EUR/m^3-H2O,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0,,
 clean water tank storage,lifetime,30.0,years,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,,,
diff --git a/outputs/US/costs_2030.csv b/outputs/US/costs_2030.csv
index 10a7e2b8..bca9b4e6 100644
--- a/outputs/US/costs_2030.csv
+++ b/outputs/US/costs_2030.csv
@@ -3912,11 +3912,6 @@ central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, inputs/techn
 central water tank storage,energy to power ratio,60.3448,h,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Ratio between energy storage and input capacity,2015.0,,
 central water tank storage,investment,3.1374,EUR/kWhCapacity,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Specific investment,2015.0,,
 central water tank storage,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Technical lifetime,2015.0,,
-central water-sourced heat pump,FOM,0.5,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Fixed O&M",2015.0,,
-central water-sourced heat pump,VOM,1.6826,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Variable O&M",2015.0,,
-central water-sourced heat pump,efficiency,3.82,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Total efficiency , net, annual average",2015.0,,
-central water-sourced heat pump,investment,1058.2216,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Specific investment",2015.0,,
-central water-sourced heat pump,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Technical lifetime",2015.0,,
 clean water tank storage,FOM,2.0,%/year,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0,,
 clean water tank storage,investment,69.1286,EUR/m^3-H2O,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0,,
 clean water tank storage,lifetime,30.0,years,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,,,
diff --git a/outputs/US/costs_2035.csv b/outputs/US/costs_2035.csv
index 83a6cebe..6c264a02 100644
--- a/outputs/US/costs_2035.csv
+++ b/outputs/US/costs_2035.csv
@@ -3936,11 +3936,6 @@ central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, inputs/techn
 central water tank storage,energy to power ratio,60.3448,h,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Ratio between energy storage and input capacity,2015.0,,
 central water tank storage,investment,3.1374,EUR/kWhCapacity,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Specific investment,2015.0,,
 central water tank storage,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Technical lifetime,2015.0,,
-central water-sourced heat pump,FOM,0.5,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Fixed O&M",2015.0,,
-central water-sourced heat pump,VOM,1.5768,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Variable O&M",2015.0,,
-central water-sourced heat pump,efficiency,3.84,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Total efficiency , net, annual average",2015.0,,
-central water-sourced heat pump,investment,1058.2216,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Specific investment",2015.0,,
-central water-sourced heat pump,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Technical lifetime",2015.0,,
 clean water tank storage,FOM,2.0,%/year,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0,,
 clean water tank storage,investment,69.1286,EUR/m^3-H2O,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0,,
 clean water tank storage,lifetime,30.0,years,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,,,
diff --git a/outputs/US/costs_2040.csv b/outputs/US/costs_2040.csv
index ebba9988..c8f1c453 100644
--- a/outputs/US/costs_2040.csv
+++ b/outputs/US/costs_2040.csv
@@ -3936,11 +3936,6 @@ central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, inputs/techn
 central water tank storage,energy to power ratio,60.3448,h,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Ratio between energy storage and input capacity,2015.0,,
 central water tank storage,investment,3.1374,EUR/kWhCapacity,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Specific investment,2015.0,,
 central water tank storage,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Technical lifetime,2015.0,,
-central water-sourced heat pump,FOM,0.5,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Fixed O&M",2015.0,,
-central water-sourced heat pump,VOM,1.4709,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Variable O&M",2015.0,,
-central water-sourced heat pump,efficiency,3.86,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Total efficiency , net, annual average",2015.0,,
-central water-sourced heat pump,investment,1058.2216,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Specific investment",2015.0,,
-central water-sourced heat pump,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Technical lifetime",2015.0,,
 clean water tank storage,FOM,2.0,%/year,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0,,
 clean water tank storage,investment,69.1286,EUR/m^3-H2O,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0,,
 clean water tank storage,lifetime,30.0,years,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,,,
diff --git a/outputs/US/costs_2045.csv b/outputs/US/costs_2045.csv
index 52c319e8..5ef396cf 100644
--- a/outputs/US/costs_2045.csv
+++ b/outputs/US/costs_2045.csv
@@ -3936,11 +3936,6 @@ central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, inputs/techn
 central water tank storage,energy to power ratio,60.3448,h,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Ratio between energy storage and input capacity,2015.0,,
 central water tank storage,investment,3.1374,EUR/kWhCapacity,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Specific investment,2015.0,,
 central water tank storage,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Technical lifetime,2015.0,,
-central water-sourced heat pump,FOM,0.5,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Fixed O&M",2015.0,,
-central water-sourced heat pump,VOM,1.4709,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Variable O&M",2015.0,,
-central water-sourced heat pump,efficiency,3.86,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Total efficiency , net, annual average",2015.0,,
-central water-sourced heat pump,investment,1058.2216,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Specific investment",2015.0,,
-central water-sourced heat pump,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Technical lifetime",2015.0,,
 clean water tank storage,FOM,2.0,%/year,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0,,
 clean water tank storage,investment,69.1286,EUR/m^3-H2O,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0,,
 clean water tank storage,lifetime,30.0,years,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,,,
diff --git a/outputs/US/costs_2050.csv b/outputs/US/costs_2050.csv
index 3afdfb32..f4f587fa 100644
--- a/outputs/US/costs_2050.csv
+++ b/outputs/US/costs_2050.csv
@@ -3936,11 +3936,6 @@ central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, inputs/techn
 central water tank storage,energy to power ratio,60.3448,h,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Ratio between energy storage and input capacity,2015.0,,
 central water tank storage,investment,3.1374,EUR/kWhCapacity,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Specific investment,2015.0,,
 central water tank storage,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Technical lifetime,2015.0,,
-central water-sourced heat pump,FOM,0.5,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Fixed O&M",2015.0,,
-central water-sourced heat pump,VOM,1.4709,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Variable O&M",2015.0,,
-central water-sourced heat pump,efficiency,3.86,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Total efficiency , net, annual average",2015.0,,
-central water-sourced heat pump,investment,1058.2216,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Specific investment",2015.0,,
-central water-sourced heat pump,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Technical lifetime",2015.0,,
 clean water tank storage,FOM,2.0,%/year,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0,,
 clean water tank storage,investment,69.1286,EUR/m^3-H2O,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0,,
 clean water tank storage,lifetime,30.0,years,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,,,
diff --git a/outputs/costs_2020.csv b/outputs/costs_2020.csv
index 1997004f..9adcc1ba 100644
--- a/outputs/costs_2020.csv
+++ b/outputs/costs_2020.csv
@@ -737,11 +737,6 @@ central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, inputs/techn
 central water tank storage,energy to power ratio,60.3448,h,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Ratio between energy storage and input capacity,2015.0
 central water tank storage,investment,3.1374,EUR/kWhCapacity,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Specific investment,2015.0
 central water tank storage,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Technical lifetime,2015.0
-central water-sourced heat pump,FOM,0.5,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Fixed O&M",2015.0
-central water-sourced heat pump,VOM,1.8942,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Variable O&M",2015.0
-central water-sourced heat pump,efficiency,3.78,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Total efficiency , net, annual average",2015.0
-central water-sourced heat pump,investment,1058.2216,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Specific investment",2015.0
-central water-sourced heat pump,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Technical lifetime",2015.0
 clean water tank storage,FOM,2.0,%/year,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0
 clean water tank storage,investment,69.1286,EUR/m^3-H2O,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0
 clean water tank storage,lifetime,30.0,years,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,
diff --git a/outputs/costs_2025.csv b/outputs/costs_2025.csv
index c5c01d96..9e70e5f9 100644
--- a/outputs/costs_2025.csv
+++ b/outputs/costs_2025.csv
@@ -737,11 +737,6 @@ central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, inputs/techn
 central water tank storage,energy to power ratio,60.3448,h,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Ratio between energy storage and input capacity,2015.0
 central water tank storage,investment,3.1374,EUR/kWhCapacity,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Specific investment,2015.0
 central water tank storage,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Technical lifetime,2015.0
-central water-sourced heat pump,FOM,0.5,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Fixed O&M",2015.0
-central water-sourced heat pump,VOM,1.7884,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Variable O&M",2015.0
-central water-sourced heat pump,efficiency,3.8,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Total efficiency , net, annual average",2015.0
-central water-sourced heat pump,investment,1058.2216,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Specific investment",2015.0
-central water-sourced heat pump,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Technical lifetime",2015.0
 clean water tank storage,FOM,2.0,%/year,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0
 clean water tank storage,investment,69.1286,EUR/m^3-H2O,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0
 clean water tank storage,lifetime,30.0,years,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,
diff --git a/outputs/costs_2030.csv b/outputs/costs_2030.csv
index 81694585..0b41cac5 100644
--- a/outputs/costs_2030.csv
+++ b/outputs/costs_2030.csv
@@ -737,11 +737,6 @@ central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, inputs/techn
 central water tank storage,energy to power ratio,60.3448,h,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Ratio between energy storage and input capacity,2015.0
 central water tank storage,investment,3.1374,EUR/kWhCapacity,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Specific investment,2015.0
 central water tank storage,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Technical lifetime,2015.0
-central water-sourced heat pump,FOM,0.5,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Fixed O&M",2015.0
-central water-sourced heat pump,VOM,1.6826,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Variable O&M",2015.0
-central water-sourced heat pump,efficiency,3.82,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Total efficiency , net, annual average",2015.0
-central water-sourced heat pump,investment,1058.2216,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Specific investment",2015.0
-central water-sourced heat pump,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Technical lifetime",2015.0
 clean water tank storage,FOM,2.0,%/year,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0
 clean water tank storage,investment,69.1286,EUR/m^3-H2O,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0
 clean water tank storage,lifetime,30.0,years,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,
diff --git a/outputs/costs_2035.csv b/outputs/costs_2035.csv
index 75c6d1da..d787787a 100644
--- a/outputs/costs_2035.csv
+++ b/outputs/costs_2035.csv
@@ -737,11 +737,6 @@ central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, inputs/techn
 central water tank storage,energy to power ratio,60.3448,h,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Ratio between energy storage and input capacity,2015.0
 central water tank storage,investment,3.1374,EUR/kWhCapacity,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Specific investment,2015.0
 central water tank storage,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Technical lifetime,2015.0
-central water-sourced heat pump,FOM,0.5,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Fixed O&M",2015.0
-central water-sourced heat pump,VOM,1.5768,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Variable O&M",2015.0
-central water-sourced heat pump,efficiency,3.84,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Total efficiency , net, annual average",2015.0
-central water-sourced heat pump,investment,1058.2216,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Specific investment",2015.0
-central water-sourced heat pump,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Technical lifetime",2015.0
 clean water tank storage,FOM,2.0,%/year,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0
 clean water tank storage,investment,69.1286,EUR/m^3-H2O,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0
 clean water tank storage,lifetime,30.0,years,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,
diff --git a/outputs/costs_2040.csv b/outputs/costs_2040.csv
index 259ace98..bacdadfe 100644
--- a/outputs/costs_2040.csv
+++ b/outputs/costs_2040.csv
@@ -737,11 +737,6 @@ central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, inputs/techn
 central water tank storage,energy to power ratio,60.3448,h,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Ratio between energy storage and input capacity,2015.0
 central water tank storage,investment,3.1374,EUR/kWhCapacity,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Specific investment,2015.0
 central water tank storage,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Technical lifetime,2015.0
-central water-sourced heat pump,FOM,0.5,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Fixed O&M",2015.0
-central water-sourced heat pump,VOM,1.4709,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Variable O&M",2015.0
-central water-sourced heat pump,efficiency,3.86,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Total efficiency , net, annual average",2015.0
-central water-sourced heat pump,investment,1058.2216,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Specific investment",2015.0
-central water-sourced heat pump,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Technical lifetime",2015.0
 clean water tank storage,FOM,2.0,%/year,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0
 clean water tank storage,investment,69.1286,EUR/m^3-H2O,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0
 clean water tank storage,lifetime,30.0,years,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,
diff --git a/outputs/costs_2045.csv b/outputs/costs_2045.csv
index 4776f51c..73550d20 100644
--- a/outputs/costs_2045.csv
+++ b/outputs/costs_2045.csv
@@ -737,11 +737,6 @@ central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, inputs/techn
 central water tank storage,energy to power ratio,60.3448,h,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Ratio between energy storage and input capacity,2015.0
 central water tank storage,investment,3.1374,EUR/kWhCapacity,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Specific investment,2015.0
 central water tank storage,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Technical lifetime,2015.0
-central water-sourced heat pump,FOM,0.5,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Fixed O&M",2015.0
-central water-sourced heat pump,VOM,1.4709,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Variable O&M",2015.0
-central water-sourced heat pump,efficiency,3.86,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Total efficiency , net, annual average",2015.0
-central water-sourced heat pump,investment,1058.2216,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Specific investment",2015.0
-central water-sourced heat pump,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Technical lifetime",2015.0
 clean water tank storage,FOM,2.0,%/year,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0
 clean water tank storage,investment,69.1286,EUR/m^3-H2O,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0
 clean water tank storage,lifetime,30.0,years,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,
diff --git a/outputs/costs_2050.csv b/outputs/costs_2050.csv
index 02166023..6e1e9087 100644
--- a/outputs/costs_2050.csv
+++ b/outputs/costs_2050.csv
@@ -737,11 +737,6 @@ central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, inputs/techn
 central water tank storage,energy to power ratio,60.3448,h,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Ratio between energy storage and input capacity,2015.0
 central water tank storage,investment,3.1374,EUR/kWhCapacity,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Specific investment,2015.0
 central water tank storage,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank:  Technical lifetime,2015.0
-central water-sourced heat pump,FOM,0.5,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Fixed O&M",2015.0
-central water-sourced heat pump,VOM,1.4709,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Variable O&M",2015.0
-central water-sourced heat pump,efficiency,3.86,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Total efficiency , net, annual average",2015.0
-central water-sourced heat pump,investment,1058.2216,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Specific investment",2015.0
-central water-sourced heat pump,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW:  Technical lifetime",2015.0
 clean water tank storage,FOM,2.0,%/year,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0
 clean water tank storage,investment,69.1286,EUR/m^3-H2O,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0
 clean water tank storage,lifetime,30.0,years,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,
diff --git a/scripts/compile_cost_assumptions.py b/scripts/compile_cost_assumptions.py
index 07929e48..72c62a20 100644
--- a/scripts/compile_cost_assumptions.py
+++ b/scripts/compile_cost_assumptions.py
@@ -105,7 +105,6 @@
     "central geothermal-sourced heat pump": "45.1.a Geothermal DH, 1200m, E",
     "central geothermal heat source": "45.1.a Geothermal DH, 1200m, E",
     "central excess-heat-sourced heat pump": "40 Comp. hp, excess heat 10 MW",
-    "central water-sourced heat pump": "40 Comp. hp, seawater 20 MW",
     "central ground-sourced heat pump": "40 Absorption heat pump, DH",
     "central resistive heater": "41 Electric Boilers",
     "central gas boiler": "44 Natural Gas DH Only",
@@ -179,7 +178,6 @@
     "central geothermal-sourced heat pump": "H:K",
     "central geothermal heat source": "H:K",
     "central excess-heat-sourced heat pump": "H:K",
-    "central water-sourced heat pump": "H:K",
     "central ground-sourced heat pump": "I:J",
     "central resistive heater": "I:J",
     "central gas boiler": "I:J",
@@ -646,8 +644,6 @@ def get_data_DEA(
         usecols = "A:E"
     elif tech_name in ["Fischer-Tropsch", "Haber-Bosch", "air separation unit"]:
         usecols = "B:F"
-    elif tech_name in ["central water-sourced heat pump"]:
-        usecols = "B,I,K"
     else:
         usecols = "B:G"
 
@@ -678,41 +674,6 @@ def get_data_DEA(
     excel.index = excel.index.astype(str)
     excel.dropna(axis=0, how="all", inplace=True)
 
-    if tech_name in ["central water-sourced heat pump"]:
-        # use only upper uncertainty range for systems without existing water intake
-        # convert "Uncertainty (2025)"" to "2025", "Uncertainty (2050)"" to "2050" (and so on if more years are added)
-        this_years = (
-            excel.loc[:, excel.iloc[1, :] == "Lower"]
-            .iloc[0, :]
-            .str.slice(-5, -1)
-            .astype(int)
-        )
-        # get values in upper uncertainty range
-        excel = excel.loc[:, excel.iloc[1, :] == "Upper"]
-        # rename columns to years constructed above
-        excel.columns = this_years
-        # add missing years
-        for y in years:
-            if y not in excel.columns:
-                excel[y] = np.nan
-
-        # Sort columns by year
-        excel = excel.reindex(sorted(excel.columns), axis=1)
-
-        # drop row Energy/technical data (not needed, contains strings which break interpolation)
-        excel = excel[~excel.index.str.contains("Energy/technical data")]
-
-        # Interpolate to fill in NaN values
-        excel = excel.astype(float).interpolate(axis=1, method="linear")
-        # Extrapolation for missing values (not native in pandas)
-        # Currently, this is only first column (2020), since DEA data is available for 2025 and 2050
-        if excel.iloc[:, 0].isnull().all():
-            excel.iloc[:, 0] = excel.iloc[:, 1] + (
-                excel.iloc[:, 1] - excel.iloc[:, 2]
-            ) / (excel.columns[2] - excel.columns[1]) * (
-                excel.columns[1] - excel.columns[0]
-            )
-
     if 2020 not in excel.columns:
         selection = excel[excel.isin([2020])].dropna(how="all").index
         excel.columns = excel.loc[selection].iloc[0, :].fillna("Technology", limit=1)
diff --git a/test/test_compile_cost_assumptions.py b/test/test_compile_cost_assumptions.py
index 4c0cde0a..8e9ff4b0 100644
--- a/test/test_compile_cost_assumptions.py
+++ b/test/test_compile_cost_assumptions.py
@@ -120,7 +120,6 @@ def test_get_sheet_location():
         "central geothermal-sourced heat pump": "inputs/technology_data_for_el_and_dh.xlsx",
         "central geothermal heat source": "inputs/technology_data_for_el_and_dh.xlsx",
         "central excess-heat-sourced heat pump": "inputs/technology_data_for_el_and_dh.xlsx",
-        "central water-sourced heat pump": "inputs/technology_data_for_el_and_dh.xlsx",
         "central ground-sourced heat pump": "inputs/technology_data_for_el_and_dh.xlsx",
         "central resistive heater": "inputs/technology_data_for_el_and_dh.xlsx",
         "central gas boiler": "inputs/technology_data_for_el_and_dh.xlsx",
@@ -210,7 +209,6 @@ def test_get_data_from_dea(config):
         "central geothermal-sourced heat pump": (8, 9),
         "central geothermal heat source": (8, 9),
         "central excess-heat-sourced heat pump": (6, 9),
-        "central water-sourced heat pump": (6, 9),
         "central ground-sourced heat pump": (5, 9),
         "central resistive heater": (7, 9),
         "central gas boiler": (6, 9),