diff --git a/src/ui/handlers/login-or-register-ui-handler.ts b/src/ui/handlers/login-or-register-ui-handler.ts
index b5733a9eaee..e3bcc27afea 100644
--- a/src/ui/handlers/login-or-register-ui-handler.ts
+++ b/src/ui/handlers/login-or-register-ui-handler.ts
@@ -29,7 +29,6 @@ export class LoginOrRegisterUiHandler extends LoginRegisterInfoContainerUiHandle
     return [i18next.t("menu:login"), i18next.t("menu:register")];
   }
 
-  // TODO: use mixins so it's not necessary to inherit from `FormModalUiHandler`
   public override getInputFieldConfigs(): InputFieldConfig[] {
     return [];
   }
diff --git a/src/ui/handlers/login-register-info-container-ui-handler.ts b/src/ui/handlers/login-register-info-container-ui-handler.ts
index 531a78e18b4..89a166da73b 100644
--- a/src/ui/handlers/login-register-info-container-ui-handler.ts
+++ b/src/ui/handlers/login-register-info-container-ui-handler.ts
@@ -31,7 +31,6 @@ const MAX_SAVES_FOR_USERNAME_PANEL = 7;
 const ERR_NO_SAVES: string = "No save files found";
 const ERR_TOO_MANY_SAVES: string = "Too many save files found";
 
-// TODO: use mixins
 export abstract class LoginRegisterInfoContainerUiHandler extends FormModalUiHandler {
   private usernameInfoImage: Phaser.GameObjects.Image;
   private saveDownloadImage: Phaser.GameObjects.Image;
diff --git a/src/ui/handlers/oauth-providers-ui-handler.ts b/src/ui/handlers/oauth-providers-ui-handler.ts
index 9500e0b5697..4b02741fdf5 100644
--- a/src/ui/handlers/oauth-providers-ui-handler.ts
+++ b/src/ui/handlers/oauth-providers-ui-handler.ts
@@ -6,7 +6,6 @@ import { addWindow } from "#ui/ui-theme";
 import { fixedInt } from "#utils/common";
 import i18next from "i18next";
 
-// TODO: use mixins
 export abstract class OAuthProvidersUiHandler extends LoginRegisterInfoContainerUiHandler {
   private discordImage: Phaser.GameObjects.Image;
   private googleImage: Phaser.GameObjects.Image;