diff --git a/heat/db/api.py b/heat/db/api.py
index f9a050f3fd..b485c58707 100644
--- a/heat/db/api.py
+++ b/heat/db/api.py
@@ -1024,13 +1024,9 @@ def event_get_all_by_tenant(context, limit=None, marker=None,
                                          sort_keys, sort_dir, filters).all()
 
 
-def _query_all_events_by_stack(context, stack_id):
-    return context.session.query(models.Event).filter_by(stack_id=stack_id)
-
-
 def event_get_all_by_stack(context, stack_id, limit=None, marker=None,
                            sort_keys=None, sort_dir=None, filters=None):
-    query = _query_all_events_by_stack(context, stack_id)
+    query = context.session.query(models.Event).filter_by(stack_id=stack_id)
     if filters and 'uuid' in filters:
         # retrieving a single event, so eager load its rsrc_prop_data detail
         query = query.options(orm.joinedload(models.Event.rsrc_prop_data))
@@ -1089,8 +1085,12 @@ def event_count_all_by_stack(context, stack_id):
 
 
 def _find_rpd_references(context, stack_id):
-    ev_ref_ids = set(e.rsrc_prop_data_id for e
-                     in _query_all_events_by_stack(context, stack_id).all())
+    ev_ref_ids = set(
+        e.rsrc_prop_data_id for e
+        in context.session.query(models.Event).filter_by(
+            stack_id=stack_id,
+        ).all()
+    )
     rsrc_ref_ids = set(r.rsrc_prop_data_id for r
                        in context.session.query(models.Resource).filter_by(
                            stack_id=stack_id).all())
@@ -1138,7 +1138,9 @@ def _delete_event_rows(context, stack_id, limit):
     # pgsql SHOULD work with the pure DELETE/JOIN below but that must be
     # confirmed via integration tests.
     with context.session.begin():
-        query = _query_all_events_by_stack(context, stack_id)
+        query = context.session.query(models.Event).filter_by(
+            stack_id=stack_id,
+        )
         query = query.order_by(models.Event.id).limit(limit)
         id_pairs = [(e.id, e.rsrc_prop_data_id) for e in query.all()]
         if not id_pairs: