diff --git a/sdk/python/feast/diff/registry_diff.py b/sdk/python/feast/diff/registry_diff.py
index b2caec2b68..6f372a7915 100644
--- a/sdk/python/feast/diff/registry_diff.py
+++ b/sdk/python/feast/diff/registry_diff.py
@@ -295,6 +295,11 @@ def apply_diff_to_registry(
                 registry.delete_feature_view(
                     feature_view_obj.name, project, commit=False,
                 )
+            elif feast_object_diff.feast_object_type == FeastObjectType.DATA_SOURCE:
+                ds_obj = cast(DataSource, feast_object_diff.current_feast_object)
+                registry.delete_data_source(
+                    ds_obj.name, project, commit=False,
+                )
 
         if feast_object_diff.transition_type in [
             TransitionType.CREATE,
diff --git a/sdk/python/feast/infra/offline_stores/file.py b/sdk/python/feast/infra/offline_stores/file.py
index 2dea5714fa..f36eb383d8 100644
--- a/sdk/python/feast/infra/offline_stores/file.py
+++ b/sdk/python/feast/infra/offline_stores/file.py
@@ -187,7 +187,6 @@ def evaluate_historical_retrieval():
                 entity_df_event_timestamp_col
             )
 
-            join_keys = []
             all_join_keys = []
 
             # Load feature view data from sources and join them incrementally