diff --git a/aleksis/apps/chronos/schema/__init__.py b/aleksis/apps/chronos/schema/__init__.py
index d2afca6635a923f860576c8161bf91d46e71c83f..898de1e363af867398d64e2f09998aa5afe9342e 100644
--- a/aleksis/apps/chronos/schema/__init__.py
+++ b/aleksis/apps/chronos/schema/__init__.py
@@ -1,4 +1,5 @@
 import graphene
+import graphene_django_optimizer
 from graphene_django import DjangoObjectType
 
 from aleksis.core.models import Group, Person, Room
@@ -241,13 +242,15 @@ class Query(graphene.ObjectType):
     timetable_days = graphene.List(graphene.Int)
 
     def resolve_timetable_teachers(self, info, **kwargs):
-        return get_teachers(info.context.user)
+        return graphene_django_optimizer.query(get_teachers(info.context.user), info)
 
     def resolve_timetable_groups(self, info, **kwargs):
-        return get_groups(info.context.user, request=info.context)
+        return graphene_django_optimizer.query(
+            get_groups(info.context.user, request=info.context), info
+        )
 
     def resolve_timetable_rooms(self, info, **kwargs):
-        return get_rooms(info.context.user)
+        return graphene_django_optimizer.query(get_rooms(info.context.user), info)
 
     def resolve_available_timetables(self, info, **kwargs):
         all_timetables = []
diff --git a/aleksis/apps/chronos/util/build.py b/aleksis/apps/chronos/util/build.py
index 66168ce2496758b6525c98fb31afbd5c686a84b5..a84e4800040897a99e5be03b2318b9e1c4a8e854 100644
--- a/aleksis/apps/chronos/util/build.py
+++ b/aleksis/apps/chronos/util/build.py
@@ -37,7 +37,6 @@ def build_substitutions_list(wanted_day: date) -> tuple[list[dict], set[Person],
         params={"amending": True},
         with_reference_object=True,
     )
-    print(supervision_events)
 
     for supervision_event in supervision_events:
         affected_teachers.update(supervision_event["REFERENCE_OBJECT"].teachers.all())