diff --git a/source/databricks/calculation_engine/package/datamigration/migration.py b/source/databricks/calculation_engine/package/datamigration/migration.py
index a990e7b8d2..372f64404a 100644
--- a/source/databricks/calculation_engine/package/datamigration/migration.py
+++ b/source/databricks/calculation_engine/package/datamigration/migration.py
@@ -11,7 +11,6 @@
 from .substitutions import get_substitutions
 
 MIGRATION_SCRIPTS_FOLDER_PATH = "package.datamigration.migration_scripts"
-UNUSED = "UNUSED"  # Marks fields that were only used in the old hive implementation
 
 
 def migrate_data_lake(
diff --git a/source/databricks/calculation_engine/package/datamigration_hive/schema_config.py b/source/databricks/calculation_engine/package/datamigration_hive/schema_config.py
index ecde845300..d6af94a9c8 100644
--- a/source/databricks/calculation_engine/package/datamigration_hive/schema_config.py
+++ b/source/databricks/calculation_engine/package/datamigration_hive/schema_config.py
@@ -22,9 +22,7 @@
     Schema(
         name=paths.HiveOutputDatabase.DATABASE_NAME,
         tables=[],
-        views=[
-            View(name=paths.HiveOutputDatabase.SUCCEEDED_ENERGY_RESULTS_V1_VIEW_NAME),
-        ],
+        views=[],
     ),
     Schema(
         # Tables in this schema are externals and schemas are not defined in the SQL scripts.
diff --git a/source/databricks/calculation_engine/package/infrastructure/paths.py b/source/databricks/calculation_engine/package/infrastructure/paths.py
index 61ca17cfab..57f8a97074 100644
--- a/source/databricks/calculation_engine/package/infrastructure/paths.py
+++ b/source/databricks/calculation_engine/package/infrastructure/paths.py
@@ -142,7 +142,11 @@ class HiveOutputDatabase:
     """The folder in the storage account container"""
 
     DATABASE_NAME = "wholesale_output"
-    SUCCEEDED_ENERGY_RESULTS_V1_VIEW_NAME = "succeeded_energy_results_v1"
+    #ENERGY_RESULT_TABLE_NAME = "energy_results"
+    #WHOLESALE_RESULT_TABLE_NAME = "wholesale_results"
+    #MONTHLY_AMOUNTS_TABLE_NAME = "monthly_amounts"
+    #TOTAL_MONTHLY_AMOUNTS_TABLE_NAME = "total_monthly_amounts"
+    #SUCCEEDED_ENERGY_RESULTS_V1_VIEW_NAME = "succeeded_energy_results_v1"
 
 
 class WholesaleBasisDataDatabase:
@@ -178,6 +182,24 @@ class HiveBasisDataDatabase:
     """The folder in the storage account container"""
 
     DATABASE_NAME = "basis_data"
+    # To be removed when tables are deleted
+    # METERING_POINT_PERIODS_TABLE_NAME = "metering_point_periods"
+    # TIME_SERIES_POINTS_TABLE_NAME = "time_series_points"
+    # CHARGE_LINK_PERIODS_TABLE_NAME = "charge_link_periods"
+    # CHARGE_PRICE_INFORMATION_PERIODS_TABLE_NAME = "charge_price_information_periods"
+    # CHARGE_PRICE_POINTS_TABLE_NAME = "charge_price_points"
+    # GRID_LOSS_METERING_POINTS_TABLE_NAME = "grid_loss_metering_points"
+    # CALCULATIONS_TABLE_NAME = "calculations"
+    #
+    # TABLE_NAMES = [
+    #     CALCULATIONS_TABLE_NAME,
+    #     METERING_POINT_PERIODS_TABLE_NAME,
+    #     TIME_SERIES_POINTS_TABLE_NAME,
+    #     CHARGE_LINK_PERIODS_TABLE_NAME,
+    #     CHARGE_PRICE_INFORMATION_PERIODS_TABLE_NAME,
+    #     CHARGE_PRICE_POINTS_TABLE_NAME,
+    #     GRID_LOSS_METERING_POINTS_TABLE_NAME,
+    # ]
 
 
 # Hive