diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss
index 2a6496cea39..e88f20d3eb4 100644
--- a/src/assets/css/main.scss
+++ b/src/assets/css/main.scss
@@ -136,7 +136,6 @@
   opacity: 0;
 }
 
-// TODO: Move this to BaseLink components
 a,
 .a {
   color: var(--link-color);
@@ -147,7 +146,6 @@ a,
   }
 }
 
-// TODO: Move this and ::placeholder to a new BaseInput component
 .input {
   @apply bg-transparent text-skin-link outline-none;
 }
diff --git a/src/composables/useFormValidation.ts b/src/composables/useFormValidation.ts
index 3da09ec6f60..c0f7359138a 100644
--- a/src/composables/useFormValidation.ts
+++ b/src/composables/useFormValidation.ts
@@ -1,9 +1,3 @@
-/**
- * A composable hook that returns the validation errors of the form as
- * a string or returns an empty string if there are no errors.
- * TODO: Extent and use this hook to validate the settings form and all future forms.
- */
-
 import defaults from '@/locales/default.json';
 import { validateSchema } from '@snapshot-labs/snapshot.js/src/utils';
 import { watchDebounced } from '@vueuse/core';
diff --git a/src/composables/useImageUpload.ts b/src/composables/useImageUpload.ts
index b789aa26340..32b6cebd2eb 100644
--- a/src/composables/useImageUpload.ts
+++ b/src/composables/useImageUpload.ts
@@ -27,8 +27,6 @@ export function useImageUpload() {
     isUploadingImage.value = true;
     const formData = new FormData();
 
-    // TODO: Make this composable useFileUpload
-
     if (!['image/jpeg', 'image/jpg', 'image/png'].includes(file.type)) {
       imageUploadError.value = t('errors.unsupportedImageType');
       isUploadingImage.value = false;
diff --git a/src/plugins/gnosis/components/CustomBlock.vue b/src/plugins/gnosis/components/CustomBlock.vue
index 5b701c897ff..d84680c11b0 100644
--- a/src/plugins/gnosis/components/CustomBlock.vue
+++ b/src/plugins/gnosis/components/CustomBlock.vue
@@ -108,7 +108,6 @@ export default {
         {{ $t('predictedImpact') }}
       </b>
       <div class="float-right">
-        <!-- TODO: use tooltip component -->
         <span :aria-label="baseToken.name" class="tooltipped tooltipped-n">
           <img
             class="circle inline-block border !align-middle leading-none"
diff --git a/src/plugins/oSnap/Create.vue b/src/plugins/oSnap/Create.vue
index ddc061f73e6..58d5429fd59 100644
--- a/src/plugins/oSnap/Create.vue
+++ b/src/plugins/oSnap/Create.vue
@@ -19,7 +19,7 @@ import {
   getIsOsnapEnabled,
   getModuleAddressForTreasury
 } from './utils';
-import OsnapMarketingWidget from './components/OsnapMarketingWidget.vue'
+import OsnapMarketingWidget from './components/OsnapMarketingWidget.vue';
 
 const props = defineProps<{
   space: ExtendedSpace;
@@ -72,7 +72,6 @@ async function fetchTokens(url: string): Promise<Token[]> {
   }
 }
 
-// todo: wire up and use these balances to enrich details in the ui, e.g. 'your safe does not have enough funds for this transaction'
 async function fetchBalances(network: Network, safeAddress: string) {
   if (!safeAddress) {
     return [];