diff --git a/src/components/tables/BundleTable.vue b/src/components/tables/BundleTable.vue
index 5cc7957ea6..c7ba7b489f 100644
--- a/src/components/tables/BundleTable.vue
+++ b/src/components/tables/BundleTable.vue
@@ -175,7 +175,6 @@ async function deleteOne(one: Element) {
   }
 
   try {
-    // todo: fix this for AB testing
     const { data: channelFound, error: errorChannel } = await supabase
       .from('channels')
       .select('name, version(name)')
diff --git a/src/pages/app/p/[p]/settings.vue b/src/pages/app/p/[p]/settings.vue
index d2d750dfb1..149957619b 100644
--- a/src/pages/app/p/[p]/settings.vue
+++ b/src/pages/app/p/[p]/settings.vue
@@ -215,7 +215,6 @@ async function setDefaultChannel() {
 }
 
 const isSuperAdmin = computed(() => {
-  // TODO: check if that is smart to not let admins delete apps
   if (!role.value)
     return false
   return organizationStore.hasPermisisonsInRole(role.value as any, ['super_admin'])
diff --git a/src/pages/dashboard/settings/organization/General.vue b/src/pages/dashboard/settings/organization/General.vue
index b0eada7869..57a8526c50 100644
--- a/src/pages/dashboard/settings/organization/General.vue
+++ b/src/pages/dashboard/settings/organization/General.vue
@@ -95,7 +95,6 @@ async function saveChanges(form: { orgName: string, email: string }) {
     .eq('id', gid)
 
   if (error) {
-    // TODO: INFORM USER THAT HE IS NOT ORG OWNER
     console.log(`Cannot save changes: ${error}`)
 
     // Revert the optimistic update
diff --git a/supabase/functions/_backend/utils/stripe.ts b/supabase/functions/_backend/utils/stripe.ts
index 8f8e62a5a5..4bf426a1ec 100644
--- a/supabase/functions/_backend/utils/stripe.ts
+++ b/supabase/functions/_backend/utils/stripe.ts
@@ -111,11 +111,11 @@ export async function createCheckout(c: Context, customerId: string, reccurence:
       name: 'auto',
     },
     tax_id_collection: { enabled: true },
-    // TODO: find why this is not working as expected
-    // saved_payment_method_options: {
-    //   allow_redisplay_filters: 'always',
-    //   payment_method_save: true,
-    // },
+    saved_payment_method_options: {
+      allow_redisplay_filters: ['always'],
+      payment_method_save: true,
+    },
+
     line_items: [
       {
         price: prices.priceId,