diff --git a/asset_list/AssetList.py b/asset_list/AssetList.py
index ffe53d40..2d224daa 100644
--- a/asset_list/AssetList.py
+++ b/asset_list/AssetList.py
@@ -751,7 +751,7 @@ class AssetList:
         # We produce some additional fields
         # 1) Is the SAP rating below C75
         self.standardised_asset_list[self.ATTRIBUTE_SAP_THRESHOLD_AND_BELOW] = (
-            self.standardised_asset_list[self.EPC_API_DATA_NAMES["current-energy-efficiency"]] <=
+            self.standardised_asset_list[self.EPC_API_DATA_NAMES["current-energy-efficiency"]].astype(float) <=
             self.FILLED_CAVITY_SAP_THRESHOLD
         )
         # 2) Flag anything where the EPC is older than 5 years
diff --git a/asset_list/app.py b/asset_list/app.py
index 229bf171..34cc9579 100644
--- a/asset_list/app.py
+++ b/asset_list/app.py
@@ -376,8 +376,6 @@ def app():
         epc_data.append(csv_data)
 
     epc_df = pd.concat(epc_data)
-    # TODO: TEMP!!!
-    epc_df = epc_df.rename(columns={"row_id": asset_list.DOMNA_PROPERTY_ID})
 
     # We expand out the recommendations
     recommendations_df = epc_df[[asset_list.DOMNA_PROPERTY_ID, "recommendations"]]
@@ -445,11 +443,6 @@ def app():
     )
 
     asset_list.merge_data(epc_df)
-    # TODO: TEMP!!!
-    epc_df["epc_os_uprn"] = epc_df["epc_os_uprn"].astype("Int64").astype(str)
-    asset_list.standardised_asset_list = asset_list.standardised_asset_list.merge(
-        epc_df.drop(columns=["domna_property_id"]), how="left", left_on="ordnance_survey_uprn", right_on="epc_os_uprn"
-    )
 
     asset_list.extract_attributes()