diff --git a/aleksis/apps/alsijil/forms.py b/aleksis/apps/alsijil/forms.py
index 3152b47e395bc7d60f622d9e02b04f21f71552af..c39709aa2b1d0161fff0ad4d13d4839b43d7ba06 100644
--- a/aleksis/apps/alsijil/forms.py
+++ b/aleksis/apps/alsijil/forms.py
@@ -46,11 +46,6 @@ class PersonalNoteForm(forms.ModelForm):
         if self.instance and getattr(self.instance, "person", None):
             self.fields["person_name"].initial = str(self.instance.person)
 
-        self.fields["extra_marks"].choices = [(e.id, str(e)) for e in ExtraMark.all]
-        self.fields["excuse_type"].choices = [(None, "-----")] + [
-            (e.id, str(e)) for e in ExcuseType.all
-        ]
-
 
 class SelectForm(forms.Form):
     layout = Layout(Row("group", "teacher"))
diff --git a/aleksis/apps/alsijil/model_extensions.py b/aleksis/apps/alsijil/model_extensions.py
index a22cc79e0c33d736a6fac875f77becfa5fdbd9a9..fddde6d59a487d2a48bed95c3eb39e27071d43b0 100644
--- a/aleksis/apps/alsijil/model_extensions.py
+++ b/aleksis/apps/alsijil/model_extensions.py
@@ -245,7 +245,7 @@ def get_extra_marks(
         week = self.week
 
     stats = {}
-    for extra_mark in ExtraMark.all:
+    for extra_mark in ExtraMark.objects.all():
         qs = self.personal_notes.filter(
             week=week.week, year=week.year, extra_marks=extra_mark
         )
diff --git a/aleksis/apps/alsijil/models.py b/aleksis/apps/alsijil/models.py
index 91f177d17b0a20028c69d1903edd146a87700aac..5f5cb29dab81c7f584d3f6f3cce21d96055c1500 100644
--- a/aleksis/apps/alsijil/models.py
+++ b/aleksis/apps/alsijil/models.py
@@ -36,12 +36,6 @@ class ExcuseType(ExtensibleModel):
     def count_label(self):
         return f"{self.short_name}_count"
 
-    @classproperty
-    @cache_memoize(3600)
-    def all(cls):
-        qs = cls.objects.all()
-        return qs
-
     class Meta:
         ordering = ["name"]
         verbose_name = _("Excuse type")
@@ -215,11 +209,6 @@ class ExtraMark(ExtensibleModel):
     def count_label(self):
         return f"{self.short_name}_count"
 
-    @classproperty
-    @cache_memoize(3600)
-    def all(cls):
-        return cls.objects.all()
-
     class Meta:
         ordering = ["short_name"]
         verbose_name = _("Extra mark")