diff --git a/src/components/names/NameARecordLink.tsx b/src/components/names/NameARecordLink.tsx
index 8298fad..4370bdc 100644
--- a/src/components/names/NameARecordLink.tsx
+++ b/src/components/names/NameARecordLink.tsx
@@ -10,7 +10,7 @@
 import "./NameARecordLink.less";
 
 function forceURL(link: string): string {
-  // TODO: this is rather crude
+  // FIXME: this is rather crude
   if (!link.startsWith("http")) return "https://" + link;
   return link;
 }
diff --git a/src/global/StorageBroadcast.tsx b/src/global/StorageBroadcast.tsx
index bb4e526..92cae34 100644
--- a/src/global/StorageBroadcast.tsx
+++ b/src/global/StorageBroadcast.tsx
@@ -49,7 +49,6 @@
 /** Component that manages a BroadcastChannel responsible for dispatching wallet
  * storage events (add, edit, delete) across tabs. */
 export function StorageBroadcast(): JSX.Element | null {
-  // TODO: is it safe to register this here?
   debug("registering storage broadcast event listener");
   channel.onmessage = e => {
     debug("received storage broadcast:", e);
diff --git a/src/global/ws/WebsocketConnection.ts b/src/global/ws/WebsocketConnection.ts
index a7af190..ff03449 100644
--- a/src/global/ws/WebsocketConnection.ts
+++ b/src/global/ws/WebsocketConnection.ts
@@ -83,7 +83,6 @@
   private handleDisconnect(err?: Error) {
     if (this.reconnectionTimer) window.clearTimeout(this.reconnectionTimer);
 
-    // TODO: show errors to the user?
     this.setConnectionState("disconnected");
     debug("failed to connect to server, reconnecting in %d ms", this.connectDebounce, err);
 
diff --git a/src/pages/backup/backupImport.ts b/src/pages/backup/backupImport.ts
index ded8204..f1d2be8 100644
--- a/src/pages/backup/backupImport.ts
+++ b/src/pages/backup/backupImport.ts
@@ -106,8 +106,6 @@
 
   // The app master password is required to import wallets. The backup import
   // is usually done through an authenticated action anyway.
-  // TODO: When adding legacy wallet imports, use the 'previous' master
-  //       password as the new one. Add a screen to change it at any point.
   if (!appMasterPassword)
     throw new TranslatedError("import.appMasterPasswordRequired");