diff --git a/client/src/components/onboarding/PersonalAddress.vue b/client/src/components/onboarding/PersonalAddress.vue
index e40dd405..0430d18a 100644
--- a/client/src/components/onboarding/PersonalAddress.vue
+++ b/client/src/components/onboarding/PersonalAddress.vue
@@ -32,13 +32,6 @@ const paymentMethods = [
   { value: "cembra_byjuno", label: t("a.Rechnung") },
 ];
 
-// TODO: remove after cembra is ready for production
-const appEnv = import.meta.env.VITE_APP_ENVIRONMENT || "local";
-if (appEnv.startsWith("prod")) {
-  paymentMethods.splice(1, 1);
-}
-// END TODO
-
 const address = computed({
   get() {
     return props.modelValue;
diff --git a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
index d6d79516..48ae62a3 100644
--- a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
+++ b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
@@ -51,10 +51,6 @@ const submissionDeadline = computed(() => {
     ?.submission_deadline;
 });
 
-// FIXME daniel: `useRouteQuery` from usevue is currently the reason that we have to
-// fix the version of @vueuse/router and @vueuse/core to 10.1.0
-// it fails with version 10.2.0. I have a reminder to check out the situation
-// at the end of July 2023
 // 0 = introduction, 1 - n = tasks, n+1 = submission
 const stepIndex = useRouteQuery("step", "0", { transform: Number, mode: "push" });
 
diff --git a/server/config/settings/base.py b/server/config/settings/base.py
index 6533d160..031cb063 100644
--- a/server/config/settings/base.py
+++ b/server/config/settings/base.py
@@ -332,7 +332,6 @@ X_FRAME_OPTIONS = "DENY"
 # EMAIL
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#email-backend
-# FIXME how to send emails?
 EMAIL_BACKEND = env(
     "DJANGO_EMAIL_BACKEND", default="django.core.mail.backends.console.EmailBackend"
 )