diff --git a/src/ui/lockable-select-ui-handler.ts b/src/ui/lockable-select-ui-handler.ts
deleted file mode 100644
index 1bdf3f4706a..00000000000
--- a/src/ui/lockable-select-ui-handler.ts
+++ /dev/null
@@ -1,409 +0,0 @@
-import BattleScene from "../battle-scene";
-import { TextStyle, addTextObject, getTextStyleOptions } from "./text";
-import { Mode } from "./ui";
-import UiHandler from "./ui-handler";
-import { addWindow } from "./ui-theme";
-import * as Utils from "../utils";
-import { Button } from "#enums/buttons";
-
-export interface LockableSelectConfig {
-  xOffset?: number;
-  yOffset?: number;
-  options: LockableSelectItem[];
-  maxOptions?: integer;
-  delay?: integer;
-  noCancel?: boolean;
-  supportHover?: boolean;
-}
-
-export interface LockableSelectItem {
-  label: string;
-  handler: () => boolean;
-  onHover?: () => void;
-  keepOpen?: boolean;
-  overrideSound?: boolean;
-  locked?: boolean;
-  title?: boolean;
-}
-
-const scrollUpLabel = "↑";
-const scrollDownLabel = "↓";
-
-export default class LockableSelectUiHandler extends UiHandler {
-  protected optionSelectContainer: Phaser.GameObjects.Container;
-  protected optionSelectBg: Phaser.GameObjects.NineSlice;
-  protected optionSelectText: Phaser.GameObjects.Text;
-  protected optionSelectIcons: Phaser.GameObjects.Sprite[];
-
-  protected config: LockableSelectConfig | null;
-
-  protected blockInput: boolean;
-
-  protected scrollCursor: integer = 0;
-
-  protected scale: number = 0.1666666667;
-
-  private cursorObj: Phaser.GameObjects.Image | null;
-
-  private textObjects: Phaser.GameObjects.Text[];
-
-  constructor(scene: BattleScene, mode: Mode | null) {
-    super(scene, mode);
-  }
-
-  getWindowWidth(): integer {
-    return 64;
-  }
-
-  getWindowHeight(): integer {
-    return (Math.min((this.config?.options || []).length, this.config?.maxOptions || 99) + 1) * 96 * this.scale;
-  }
-
-  setup() {
-    const ui = this.getUi();
-
-    this.optionSelectContainer = this.scene.add.container(0, 0);
-    this.optionSelectContainer.setName(`option-select-${this.mode ? Mode[this.mode] : "UNKNOWN"}`);
-    this.optionSelectContainer.setVisible(false);
-    ui.add(this.optionSelectContainer);
-
-    this.optionSelectBg = addWindow(this.scene, 0, 0, this.getWindowWidth(), this.getWindowHeight());
-    this.optionSelectBg.setName("option-select-bg");
-    this.optionSelectBg.setOrigin(1, 1);
-    this.optionSelectContainer.add(this.optionSelectBg);
-
-    this.optionSelectIcons = [];
-
-    this.textObjects = [];
-
-    this.scale = getTextStyleOptions(TextStyle.WINDOW, (this.scene as BattleScene).uiTheme).scale;
-
-    this.setCursor(0);
-  }
-
-  protected setupOptions() {
-    const configOptions = this.config?.options ?? [];
-
-    let options: LockableSelectItem[];
-
-    // for performance reasons, this limits how many options we can see at once. Without this, it would try to make text options for every single options
-    // which makes the performance take a hit. If there's not enough options to do this (set to 10 at the moment) and the ui mode !== Mode.AUTO_COMPLETE,
-    // this is ignored and the original code is untouched, with the options array being all the options from the config
-    if (configOptions.length >= 10 && this.scene.ui.getMode() === Mode.AUTO_COMPLETE) {
-      const optionsScrollTotal = configOptions.length;
-      const optionStartIndex = this.scrollCursor;
-      const optionEndIndex = Math.min(optionsScrollTotal, optionStartIndex + (!optionStartIndex || this.scrollCursor + (this.config?.maxOptions! - 1) >= optionsScrollTotal ? this.config?.maxOptions! - 1 : this.config?.maxOptions! - 2));
-      options = configOptions.slice(optionStartIndex, optionEndIndex + 2);
-    } else {
-      options = configOptions;
-    }
-
-    if (false) {
-      if (this.optionSelectText) {
-        this.optionSelectText.destroy();
-      }
-      if (this.optionSelectIcons?.length) {
-        this.optionSelectIcons.map(i => i.destroy());
-        this.optionSelectIcons.splice(0, this.optionSelectIcons.length);
-      }
-    }
-
-    options.forEach((option, index) => {
-      // Calculate position for each text item
-      const xOffset = option.title ? 20 : 0; // Extra offset for titles
-      const yOffset = index * (this.scale * 72); // Spacing between rows
-      console.log("x, y", xOffset, yOffset);
-
-      // Create text style dynamically
-      const textStyle = {
-        color: option.locked ? "#888888" : "#FFFFFF",
-      };
-
-      // Add the text object
-      const textObject = addTextObject(
-        this.scene,
-        0, 0,
-        option.label,
-        TextStyle.WINDOW,
-        textStyle
-      );
-
-      // Add to container
-      this.textObjects.push(textObject);
-      this.optionSelectContainer.add(this.textObjects[index]);
-      //      this.optionSelectContainer.bringToTop(textObject);
-    });
-
-    this.scene.add.text(100, 100, "Test Text", { color: "#FFFFFF", fontSize: "24px", fontFamily: "Arial" });
-    console.log("Scene:", this.scene);
-
-    const debugBg = this.scene.add.rectangle(0, 0, 400, 400, 0xff0000);
-    debugBg.setOrigin(0, 0);
-    this.optionSelectContainer.add(debugBg);
-
-    this.optionSelectContainer.setPosition(this.scene.game.canvas.width / 12, 0);
-
-    console.log(this.textObjects[0]);
-    console.log((this.scene.game.canvas.width / 6) - 1 - (this.config?.xOffset || 0), (this.config?.yOffset || 0));
-    console.log(this.optionSelectBg.originX, this.optionSelectBg.originY);
-    console.log(this.textObjects[0].originX, this.textObjects[0].originY);
-
-    console.log("Container Position:", this.optionSelectContainer.x, this.optionSelectContainer.y);
-    console.log("Game Canvas Size:", this.scene.game.canvas.width, this.scene.game.canvas.height);
-
-
-    // Adjust optionSelectBg width
-    this.optionSelectBg.width = Math.max(
-      this.textObjects.reduce((maxWidth, textObject, index) => {
-        const extraOffset = options[index].title ? 20 : 0; // Adjust offset based on the title
-        const textWidth = textObject.displayWidth; // Use existing text object
-        return Math.max(maxWidth, textWidth + extraOffset);
-      }, 0) + 24,
-      this.getWindowWidth()
-    );
-
-    this.optionSelectBg.height = this.getWindowHeight();
-
-    this.textObjects.forEach((textObject, index) => {
-      textObject.setPositionRelative(
-        this.optionSelectBg,
-        12 + 24 * this.scale + (options[index].title ? 20 : 0),  // Adjust the X offset
-        2 + 42 * this.scale + index * (96 * this.scale) // Adjust the Y offset based on index
-      );
-    });
-
-
-    // Adjust options based on scroll and set individual text objects
-    if (this.config?.options && this.config?.options.length > (this.config?.maxOptions!)) {
-      const visibleOptions = this.getOptionsWithScroll();
-
-      visibleOptions.forEach((option, i) => {
-        this.textObjects[i].setText(option.label);
-
-        // Add icon if locked
-        if (option.locked) {
-          const itemIcon = this.scene.add.sprite(0, 0, "ui", "icon_lock");
-          itemIcon.setScale(3 * this.scale);
-          this.optionSelectIcons.push(itemIcon);
-          this.optionSelectContainer.add(itemIcon);
-
-          // Position the icon relative to the text
-          itemIcon.setPositionRelative(this.textObjects[i], 0, 0);
-        }
-      });
-    }
-
-  }
-
-
-  show(args: any[]): boolean {
-    if (!args.length || !args[0].hasOwnProperty("options") || !args[0].options.length) {
-      return false;
-    }
-
-    super.show(args);
-
-    this.config = args[0] as LockableSelectConfig;
-    this.setupOptions();
-
-    this.scene.ui.bringToTop(this.optionSelectContainer);
-
-    this.optionSelectContainer.setVisible(true);
-    this.scrollCursor = 0;
-    this.setCursor(0);
-
-    if (this.config.delay) {
-      this.blockInput = true;
-      this.optionSelectText.setAlpha(0.5);
-      this.cursorObj?.setAlpha(0.8);
-      this.scene.time.delayedCall(Utils.fixedInt(this.config.delay), () => this.unblockInput());
-    }
-
-    return true;
-  }
-
-  processInput(button: Button): boolean {
-    const ui = this.getUi();
-
-    let success = false;
-
-    const options = this.getOptionsWithScroll();
-
-    let playSound = true;
-
-    if (button === Button.ACTION || button === Button.CANCEL) {
-      if (this.blockInput) {
-        ui.playError();
-        return false;
-      }
-
-      success = true;
-      if (button === Button.CANCEL) {
-        if (this.config?.maxOptions && this.config.options.length > this.config.maxOptions) {
-          this.scrollCursor = (this.config.options.length - this.config.maxOptions) + 1;
-          this.cursor = options.length - 1;
-        } else if (!this.config?.noCancel) {
-          this.setCursor(options.length - 1);
-        } else {
-          return false;
-        }
-      }
-      const option = this.config?.options[this.cursor + (this.scrollCursor - (this.scrollCursor ? 1 : 0))];
-      if (option?.handler()) {
-        if (!option.keepOpen) {
-          this.clear();
-        }
-        playSound = !option.overrideSound;
-      } else {
-        ui.playError();
-      }
-    } else if (button === Button.SUBMIT && ui.getMode() === Mode.AUTO_COMPLETE) {
-      // this is here to differentiate between a Button.SUBMIT vs Button.ACTION within the autocomplete handler
-      // this is here because Button.ACTION is picked up as z on the keyboard, meaning if you're typing and hit z, it'll select the option you've chosen
-      success = true;
-      const option = this.config?.options[this.cursor + (this.scrollCursor - (this.scrollCursor ? 1 : 0))];
-      if (option?.handler()) {
-        if (!option.keepOpen) {
-          this.clear();
-        }
-        playSound = !option.overrideSound;
-      } else {
-        ui.playError();
-      }
-    } else {
-      switch (button) {
-        case Button.UP:
-          if (this.cursor) {
-            success = this.setCursor(this.cursor - 1);
-          } else if (this.cursor === 0) {
-            success = this.setCursor(options.length - 1);
-          }
-          break;
-        case Button.DOWN:
-          if (this.cursor < options.length - 1) {
-            success = this.setCursor(this.cursor + 1);
-          } else {
-            success = this.setCursor(0);
-          }
-          break;
-      }
-      if (this.config?.supportHover) {
-        // handle hover code if the element supports hover-handlers and the option has the optional hover-handler set.
-        this.config?.options[this.cursor + (this.scrollCursor - (this.scrollCursor ? 1 : 0))]?.onHover?.();
-      }
-    }
-
-    if (success && playSound) {
-      ui.playSelect();
-    }
-
-    return success;
-  }
-
-  unblockInput(): void {
-    if (!this.blockInput) {
-      return;
-    }
-
-    this.blockInput = false;
-    this.optionSelectText.setAlpha(1);
-    this.cursorObj?.setAlpha(1);
-  }
-
-  getOptionsWithScroll(): LockableSelectItem[] {
-    if (!this.config) {
-      return [];
-    }
-
-    const options = this.config.options.slice(0);
-
-    if (!this.config.maxOptions || this.config.options.length < this.config.maxOptions) {
-      return options;
-    }
-
-    const optionsScrollTotal = options.length;
-    const optionStartIndex = this.scrollCursor;
-    const optionEndIndex = Math.min(optionsScrollTotal, optionStartIndex + (!optionStartIndex || this.scrollCursor + (this.config.maxOptions - 1) >= optionsScrollTotal ? this.config.maxOptions - 1 : this.config.maxOptions - 2));
-
-    if (this.config?.maxOptions && options.length > this.config.maxOptions) {
-      options.splice(optionEndIndex, optionsScrollTotal);
-      options.splice(0, optionStartIndex);
-      if (optionStartIndex) {
-        options.unshift({
-          label: scrollUpLabel,
-          handler: () => true
-        });
-      }
-      if (optionEndIndex < optionsScrollTotal) {
-        options.push({
-          label: scrollDownLabel,
-          handler: () => true
-        });
-      }
-    }
-
-    return options;
-  }
-
-  setCursor(cursor: integer): boolean {
-    const changed = this.cursor !== cursor;
-
-    let isScroll = false;
-    const options = this.getOptionsWithScroll();
-    if (changed && this.config?.maxOptions && this.config.options.length > this.config.maxOptions) {
-      if (Math.abs(cursor - this.cursor) === options.length - 1) {
-        // Wrap around the list
-        const optionsScrollTotal = this.config.options.length;
-        this.scrollCursor = cursor ? optionsScrollTotal - (this.config.maxOptions - 1) : 0;
-        this.setupOptions();
-      } else {
-        // Move the cursor up or down by 1
-        const isDown = cursor && cursor > this.cursor;
-        if (isDown) {
-          if (options[cursor].label === scrollDownLabel) {
-            isScroll = true;
-            this.scrollCursor++;
-          }
-        } else {
-          if (!cursor && this.scrollCursor) {
-            isScroll = true;
-            this.scrollCursor--;
-          }
-        }
-        if (isScroll && this.scrollCursor === 1) {
-          this.scrollCursor += isDown ? 1 : -1;
-        }
-      }
-    }
-    if (isScroll) {
-      this.setupOptions();
-    } else {
-      this.cursor = cursor;
-    }
-
-    if (!this.cursorObj) {
-      this.cursorObj = this.scene.add.image(0, 0, "cursor");
-      this.optionSelectContainer.add(this.cursorObj);
-    }
-
-    this.cursorObj.setScale(this.scale * 6);
-    this.cursorObj.setPositionRelative(this.optionSelectBg, 12, 102 * this.scale + this.cursor * (114 * this.scale - 3));
-
-    return changed;
-  }
-
-  clear() {
-    super.clear();
-    this.config = null;
-    this.optionSelectContainer.setVisible(false);
-    this.scrollCursor = 0;
-    this.eraseCursor();
-  }
-
-  eraseCursor() {
-    if (this.cursorObj) {
-      this.cursorObj.destroy();
-    }
-    this.cursorObj = null;
-  }
-}
diff --git a/src/ui/ui.ts b/src/ui/ui.ts
index c656b2d7f89..05015b72390 100644
--- a/src/ui/ui.ts
+++ b/src/ui/ui.ts
@@ -56,7 +56,6 @@ import { Device } from "#enums/devices";
 import MysteryEncounterUiHandler from "./mystery-encounter-ui-handler";
 import PokedexScanUiHandler from "./pokedex-scan-ui-handler";
 import PokedexPageUiHandler from "./pokedex-page-ui-handler";
-import LockableSelectUiHandler from "./lockable-select-ui-handler";
 
 export enum Mode {
   MESSAGE,
@@ -91,7 +90,6 @@ export enum Mode {
   POKEDEX,
   POKEDEX_SCAN,
   POKEDEX_PAGE,
-  LOCKABLE_SELECT,
   LOGIN_FORM,
   REGISTRATION_FORM,
   LOADING,
@@ -138,7 +136,6 @@ const noTransitionModes = [
   Mode.ACHIEVEMENTS,
   Mode.GAME_STATS,
   Mode.POKEDEX_SCAN,
-  Mode.LOCKABLE_SELECT,
   Mode.LOGIN_FORM,
   Mode.REGISTRATION_FORM,
   Mode.LOADING,
@@ -207,7 +204,6 @@ export default class UI extends Phaser.GameObjects.Container {
       new PokedexUiHandler(scene),
       new PokedexScanUiHandler(scene, Mode.TEST_DIALOGUE),
       new PokedexPageUiHandler(scene),
-      new LockableSelectUiHandler(scene, Mode.LOCKABLE_SELECT),
       new LoginFormUiHandler(scene),
       new RegistrationFormUiHandler(scene),
       new LoadingModalUiHandler(scene),