diff --git a/src/components/views/rooms/E2EIcon.tsx b/src/components/views/rooms/E2EIcon.tsx
index 1e40361346..29899e85ba 100644
--- a/src/components/views/rooms/E2EIcon.tsx
+++ b/src/components/views/rooms/E2EIcon.tsx
@@ -19,9 +19,7 @@ import { XOR } from "../../../@types/common";
 export enum E2EState {
     Verified = "verified",
     Warning = "warning",
-    Unknown = "unknown",
     Normal = "normal",
-    Unauthenticated = "unauthenticated",
 }
 
 const crossSigningUserTitles: { [key in E2EState]?: TranslationKey } = {
diff --git a/src/components/views/spaces/SpaceCreateMenu.tsx b/src/components/views/spaces/SpaceCreateMenu.tsx
index 2ac2fee454..764417e0b2 100644
--- a/src/components/views/spaces/SpaceCreateMenu.tsx
+++ b/src/components/views/spaces/SpaceCreateMenu.tsx
@@ -43,6 +43,7 @@ import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
 import defaultDispatcher from "../../../dispatcher/dispatcher";
 import { Action } from "../../../dispatcher/actions";
 import { Filter } from "../dialogs/spotlight/Filter";
+import { OpenSpotlightPayload } from "../../../dispatcher/payloads/OpenSpotlightPayload.ts";
 
 export const createSpace = async (
     client: MatrixClient,
@@ -265,7 +266,7 @@ const SpaceCreateMenu: React.FC<{
     };
 
     const onSearchClick = (): void => {
-        defaultDispatcher.dispatch({
+        defaultDispatcher.dispatch<OpenSpotlightPayload>({
             action: Action.OpenSpotlight,
             initialFilter: Filter.PublicSpaces,
         });
diff --git a/src/dispatcher/actions.ts b/src/dispatcher/actions.ts
index 50c8160721..718f592e6a 100644
--- a/src/dispatcher/actions.ts
+++ b/src/dispatcher/actions.ts
@@ -135,12 +135,6 @@ export enum Action {
      */
     OpenDialPad = "open_dial_pad",
 
-    /**
-     * Dial the phone number in the payload
-     * payload: DialNumberPayload
-     */
-    DialNumber = "dial_number",
-
     /**
      * Fired when CallHandler has checked for PSTN protocol support
      * payload: none
diff --git a/src/performance/entry-names.ts b/src/performance/entry-names.ts
index 331930cb1e..13953ebf32 100644
--- a/src/performance/entry-names.ts
+++ b/src/performance/entry-names.ts
@@ -11,38 +11,12 @@ export enum PerformanceEntryNames {
      * Application wide
      */
 
-    APP_STARTUP = "mx_AppStartup",
     PAGE_CHANGE = "mx_PageChange",
 
-    /**
-     * Events
-     */
-
-    RESEND_EVENT = "mx_ResendEvent",
-    SEND_E2EE_EVENT = "mx_SendE2EEEvent",
-    SEND_ATTACHMENT = "mx_SendAttachment",
-
-    /**
-     * Rooms
-     */
-
-    SWITCH_ROOM = "mx_SwithRoom",
-    JUMP_TO_ROOM = "mx_JumpToRoom",
-    JOIN_ROOM = "mx_JoinRoom", // ✅
-    CREATE_DM = "mx_CreateDM", // ✅
-    PEEK_ROOM = "mx_PeekRoom",
-
     /**
      * User
      */
 
-    VERIFY_E2EE_USER = "mx_VerifyE2EEUser", // ✅
     LOGIN = "mx_Login", // ✅
     REGISTER = "mx_Register", // ✅
-
-    /**
-     * VoIP
-     */
-
-    SETUP_VOIP_CALL = "mx_SetupVoIPCall",
 }