diff --git a/dashboard/src/Index.vue b/dashboard/src/Index.vue
index 8681c7f70..709736300 100644
--- a/dashboard/src/Index.vue
+++ b/dashboard/src/Index.vue
@@ -244,7 +244,6 @@ onMounted(async () => {
             <div class="sidebar-item" v-show="profile.isAtLeastMailManager" @click="onToggleGroup('email')"><i class="fa fa-envelope fa-fw"></i>{{ $t('emails.title') }} <i class="collapse fa-solid fa-angle-right" :class="{ expanded: activeSidebarGroup === 'email' }" style="margin-left: 6px;"></i> </div>
             <Transition name="sidebar-item-group-animation">
               <div class="sidebar-item-group" v-if="activeSidebarGroup === 'email'">
-                <!-- TODO separate the views -->
                 <a class="sidebar-item" :class="{ active: activeSidebarItem === 'email-domain' }" href="#/email-domain" @click="onSidebarClose()"><i class="fa fa-fw fa-wrench"></i> Domains</a>
                 <a class="sidebar-item" :class="{ active: activeSidebarItem === 'email-mailboxes' }" href="#/email-mailboxes" @click="onSidebarClose()"><i class="fa fa-fw fa-inbox"></i> {{ $t('email.incoming.mailboxes.title') }}</a>
                 <a class="sidebar-item" :class="{ active: activeSidebarItem === 'email-mailinglists' }" href="#/email-mailinglists" @click="onSidebarClose()"><i class="fa fa-fw-solid fa-envelopes-bulk"></i> {{ $t('email.incoming.mailinglists.title') }}</a>
diff --git a/dashboard/src/components/AccessControl.vue b/dashboard/src/components/AccessControl.vue
index 4f8e0a35a..35cc34e5b 100644
--- a/dashboard/src/components/AccessControl.vue
+++ b/dashboard/src/components/AccessControl.vue
@@ -16,7 +16,6 @@ const accessRestriction = defineModel('acl');
 const users = ref([]);
 const groups = ref([]);
 
-// TODO check if we should offer this for already installed apps!
 const optionalSso = !!props.manifest.optionalSso;
 const cloudronAuth = !!(props.manifest.addons['ldap'] || props.manifest.addons['oidc'] || props.manifest.addons['proxyAuth']) && !props.hideOptionalSsoOption;
 
diff --git a/dashboard/src/components/BackupSchedule.vue b/dashboard/src/components/BackupSchedule.vue
index ce535857a..a8dddf9e0 100644
--- a/dashboard/src/components/BackupSchedule.vue
+++ b/dashboard/src/components/BackupSchedule.vue
@@ -75,7 +75,6 @@ const policy = ref({
   schedule: '',
   retention: ''
 });
-const cleanupBusy = ref(false);
 const cleanupTask = ref({});
 
 async function onCleanup() {
@@ -255,9 +254,13 @@ onMounted(async () => {
       <div class="info-value">{{ prettyBackupRetention(policy.retention) }}</div>
     </div>
 
-    <!-- TODO maybe track the cleanup -->
+    <div v-if="cleanupTask.active">
+      <ProgressBar :value="cleanupTask.percent" />
+      <div>{{ cleanupTask.message }}</div>
+    </div>
+
     <div class="button-bar">
-      <Button @click="onCleanup()" :disabled="cleanupBusy" :loading="cleanupBusy">{{ $t('backups.listing.cleanupBackups') }}</Button>
+      <Button @click="onCleanup()" :disabled="cleanupTask.active" :loading="cleanupTask.active">{{ $t('backups.listing.cleanupBackups') }}</Button>
       <Button v-show="props.profile.isAtLeastOwner" @click="onConfigure()">{{ $t('backups.schedule.configure') }}</Button>
     </div>
   </Section>