Step 1: Remove all usage of @replaceableComponent

src/components/structures/ContextMenu.tsx

@@ -22,7 +22,6 @@ import classNames from "classnames";
 import FocusLock from "react-focus-lock";
 
 import { Writeable } from "../../@types/common";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import UIStore from "../../stores/UIStore";
 import { checkInputableElement, RovingTabIndexProvider } from "../../accessibility/RovingTabIndex";
 import { KeyBindingAction } from "../../accessibility/KeyboardShortcuts";
@@ -105,7 +104,6 @@ interface IState {
 // Generic ContextMenu Portal wrapper
 // all options inside the menu should be of role=menuitem/menuitemcheckbox/menuitemradiobutton and have tabIndex={-1}
 // this will allow the ContextMenu to manage its own focus using arrow keys as per the ARIA guidelines.
-@replaceableComponent("structures.ContextMenu")
 export default class ContextMenu extends React.PureComponent<IProps, IState> {
     private readonly initialFocus: HTMLElement;
 

src/components/structures/FilePanel.tsx

@@ -29,7 +29,6 @@ import EventIndexPeg from "../../indexing/EventIndexPeg";
 import { _t } from '../../languageHandler';
 import DesktopBuildsNotice, { WarningKind } from "../views/elements/DesktopBuildsNotice";
 import BaseCard from "../views/right_panel/BaseCard";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import ResizeNotifier from '../../utils/ResizeNotifier';
 import TimelinePanel from "./TimelinePanel";
 import Spinner from "../views/elements/Spinner";
@@ -51,7 +50,6 @@ interface IState {
 /*
  * Component which shows the filtered file using a TimelinePanel
  */
-@replaceableComponent("structures.FilePanel")
 class FilePanel extends React.Component<IProps, IState> {
     static contextType = RoomContext;
 

src/components/structures/GenericErrorPage.tsx

@@ -16,14 +16,11 @@ limitations under the License.
 
 import React from 'react';
 
-import { replaceableComponent } from "../../utils/replaceableComponent";
-
 interface IProps {
     title: React.ReactNode;
     message: React.ReactNode;
 }
 
-@replaceableComponent("structures.GenericErrorPage")
 export default class GenericErrorPage extends React.PureComponent<IProps> {
     render() {
         return <div className='mx_GenericErrorPage'>

src/components/structures/HostSignupAction.tsx

@@ -23,7 +23,6 @@ import {
 import { _t } from "../../languageHandler";
 import { HostSignupStore } from "../../stores/HostSignupStore";
 import SdkConfig from "../../SdkConfig";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 
 interface IProps {
     onClick?(): void;
@@ -31,7 +30,6 @@ interface IProps {
 
 interface IState {}
 
-@replaceableComponent("structures.HostSignupAction")
 export default class HostSignupAction extends React.PureComponent<IProps, IState> {
     private openDialog = async () => {
         this.props.onClick?.();

src/components/structures/IndicatorScrollbar.tsx

@@ -17,7 +17,6 @@ limitations under the License.
 import React, { ComponentProps, createRef } from "react";
 
 import AutoHideScrollbar from "./AutoHideScrollbar";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import UIStore, { UI_EVENTS } from "../../stores/UIStore";
 
 interface IProps extends Omit<ComponentProps<typeof AutoHideScrollbar>, "onWheel"> {
@@ -40,7 +39,6 @@ interface IState {
     rightIndicatorOffset: string;
 }
 
-@replaceableComponent("structures.IndicatorScrollbar")
 export default class IndicatorScrollbar extends React.Component<IProps, IState> {
     private autoHideScrollbar = createRef<AutoHideScrollbar>();
     private scrollElement: HTMLDivElement;

src/components/structures/InteractiveAuth.tsx

@@ -28,7 +28,6 @@ import { logger } from "matrix-js-sdk/src/logger";
 
 import getEntryComponentForLoginType, { IStageComponent } from '../views/auth/InteractiveAuthEntryComponents';
 import Spinner from "../views/elements/Spinner";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 
 export const ERROR_USER_CANCELLED = new Error("User cancelled auth session");
 
@@ -89,7 +88,6 @@ interface IState {
     submitButtonEnabled: boolean;
 }
 
-@replaceableComponent("structures.InteractiveAuthComponent")
 export default class InteractiveAuthComponent extends React.Component<IProps, IState> {
     private readonly authLogic: InteractiveAuth;
     private readonly intervalId: number = null;

src/components/structures/LeftPanel.tsx

@@ -27,7 +27,6 @@ import { Action } from "../../dispatcher/actions";
 import RoomSearch from "./RoomSearch";
 import ResizeNotifier from "../../utils/ResizeNotifier";
 import AccessibleTooltipButton from "../views/elements/AccessibleTooltipButton";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import SpaceStore from "../../stores/spaces/SpaceStore";
 import { MetaSpace, SpaceKey, UPDATE_SELECTED_SPACE } from "../../stores/spaces";
 import { getKeyBindingsManager } from "../../KeyBindingsManager";
@@ -62,7 +61,6 @@ interface IState {
     activeSpace: SpaceKey;
 }
 
-@replaceableComponent("structures.LeftPanel")
 export default class LeftPanel extends React.Component<IProps, IState> {
     private listContainerRef = createRef<HTMLDivElement>();
     private roomSearchRef = createRef<RoomSearch>();

src/components/structures/LoggedInView.tsx

@@ -52,7 +52,6 @@ import HostSignupContainer from '../views/host_signup/HostSignupContainer';
 import { getKeyBindingsManager } from '../../KeyBindingsManager';
 import { IOpts } from "../../createRoom";
 import SpacePanel from "../views/spaces/SpacePanel";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import CallHandler, { CallHandlerEvent } from '../../CallHandler';
 import AudioFeedArrayForCall from '../views/voip/AudioFeedArrayForCall';
 import { OwnProfileStore } from '../../stores/OwnProfileStore';
@@ -127,7 +126,6 @@ interface IState {
  *
  * Components mounted below us can access the matrix client via the react context.
  */
-@replaceableComponent("structures.LoggedInView")
 class LoggedInView extends React.Component<IProps, IState> {
     static displayName = 'LoggedInView';
 

src/components/structures/MainSplit.tsx

@@ -19,7 +19,6 @@ import React from 'react';
 import { NumberSize, Resizable } from 're-resizable';
 import { Direction } from "re-resizable/lib/resizer";
 
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import ResizeNotifier from "../../utils/ResizeNotifier";
 
 interface IProps {
@@ -28,7 +27,6 @@ interface IProps {
     panel?: JSX.Element;
 }
 
-@replaceableComponent("structures.MainSplit")
 export default class MainSplit extends React.Component<IProps> {
     private onResizeStart = (): void => {
         this.props.resizeNotifier.startResizing();

src/components/structures/MatrixChat.tsx

@@ -89,7 +89,6 @@ import { UIFeature } from "../../settings/UIFeature";
 import DialPadModal from "../views/voip/DialPadModal";
 import { showToast as showMobileGuideToast } from '../../toasts/MobileGuideToast';
 import { shouldUseLoginForWelcome } from "../../utils/pages";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import RoomListStore from "../../stores/room-list/RoomListStore";
 import { RoomUpdateCause } from "../../stores/room-list/models";
 import SecurityCustomisations from "../../customisations/Security";
@@ -207,7 +206,6 @@ interface IState {
     forceTimeline?: boolean; // see props
 }
 
-@replaceableComponent("structures.MatrixChat")
 export default class MatrixChat extends React.PureComponent<IProps, IState> {
     static displayName = "MatrixChat";
 

src/components/structures/MessagePanel.tsx

@@ -37,7 +37,6 @@ import IRCTimelineProfileResizer from "../views/elements/IRCTimelineProfileResiz
 import DMRoomMap from "../../utils/DMRoomMap";
 import NewRoomIntro from "../views/rooms/NewRoomIntro";
 import HistoryTile from "../views/rooms/HistoryTile";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import defaultDispatcher from '../../dispatcher/dispatcher';
 import CallEventGrouper from "./CallEventGrouper";
 import WhoIsTypingTile from '../views/rooms/WhoIsTypingTile';
@@ -199,7 +198,6 @@ interface IReadReceiptForUser {
 
 /* (almost) stateless UI component which builds the event tiles in the room timeline.
  */
-@replaceableComponent("structures.MessagePanel")
 export default class MessagePanel extends React.Component<IProps, IState> {
     static contextType = RoomContext;
     public context!: React.ContextType<typeof RoomContext>;

src/components/structures/NonUrgentToastContainer.tsx

@@ -19,7 +19,6 @@ import * as React from "react";
 import { ComponentClass } from "../../@types/common";
 import NonUrgentToastStore from "../../stores/NonUrgentToastStore";
 import { UPDATE_EVENT } from "../../stores/AsyncStore";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 
 interface IProps {
 }
@@ -28,7 +27,6 @@ interface IState {
     toasts: ComponentClass[];
 }
 
-@replaceableComponent("structures.NonUrgentToastContainer")
 export default class NonUrgentToastContainer extends React.PureComponent<IProps, IState> {
     public constructor(props, context) {
         super(props, context);

src/components/structures/NotificationPanel.tsx

@@ -20,7 +20,6 @@ import { logger } from "matrix-js-sdk/src/logger";
 import { _t } from '../../languageHandler';
 import { MatrixClientPeg } from "../../MatrixClientPeg";
 import BaseCard from "../views/right_panel/BaseCard";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import TimelinePanel from "./TimelinePanel";
 import Spinner from "../views/elements/Spinner";
 import { Layout } from "../../settings/enums/Layout";
@@ -38,7 +37,6 @@ interface IState {
 /*
  * Component which shows the global notification list using a TimelinePanel
  */
-@replaceableComponent("structures.NotificationPanel")
 export default class NotificationPanel extends React.PureComponent<IProps, IState> {
     static contextType = RoomContext;
 

src/components/structures/RightPanel.tsx

@@ -28,7 +28,6 @@ import RightPanelStore from "../../stores/right-panel/RightPanelStore";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import RoomSummaryCard from "../views/right_panel/RoomSummaryCard";
 import WidgetCard from "../views/right_panel/WidgetCard";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import SettingsStore from "../../settings/SettingsStore";
 import MemberList from "../views/rooms/MemberList";
 import UserInfo from "../views/right_panel/UserInfo";
@@ -60,7 +59,6 @@ interface IState {
     cardState?: IRightPanelCardState;
 }
 
-@replaceableComponent("structures.RightPanel")
 export default class RightPanel extends React.Component<IProps, IState> {
     static contextType = MatrixClientContext;
     public context!: React.ContextType<typeof MatrixClientContext>;

src/components/structures/RoomDirectory.tsx

@@ -31,7 +31,6 @@ import { instanceForInstanceId, protocolNameForInstanceId } from '../../utils/Di
 import Analytics from '../../Analytics';
 import NetworkDropdown, { ALL_ROOMS, Protocols } from "../views/directory/NetworkDropdown";
 import SettingsStore from "../../settings/SettingsStore";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import { mediaFromMxc } from "../../customisations/Media";
 import { IDialogProps } from "../views/dialogs/IDialogProps";
 import AccessibleButton, { ButtonEvent } from "../views/elements/AccessibleButton";
@@ -71,7 +70,6 @@ interface IState {
     filterString: string;
 }
 
-@replaceableComponent("structures.RoomDirectory")
 export default class RoomDirectory extends React.Component<IProps, IState> {
     private unmounted = false;
     private nextBatch: string = null;

src/components/structures/RoomSearch.tsx

@@ -26,7 +26,6 @@ import { Action } from "../../dispatcher/actions";
 import RoomListStore from "../../stores/room-list/RoomListStore";
 import { NameFilterCondition } from "../../stores/room-list/filters/NameFilterCondition";
 import { getKeyBindingsManager } from "../../KeyBindingsManager";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import SpaceStore from "../../stores/spaces/SpaceStore";
 import { UPDATE_SELECTED_SPACE } from "../../stores/spaces";
 import { isMac, Key } from "../../Keyboard";
@@ -50,7 +49,6 @@ interface IState {
     spotlightBetaEnabled: boolean;
 }
 
-@replaceableComponent("structures.RoomSearch")
 export default class RoomSearch extends React.PureComponent<IProps, IState> {
     private readonly dispatcherRef: string;
     private readonly betaRef: string;

src/components/structures/RoomStatusBar.tsx

@@ -24,7 +24,6 @@ import Resend from '../../Resend';
 import dis from '../../dispatcher/dispatcher';
 import { messageForResourceLimitError } from '../../utils/ErrorUtils';
 import { Action } from "../../dispatcher/actions";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import NotificationBadge from "../views/rooms/NotificationBadge";
 import { StaticNotificationState } from "../../stores/notifications/StaticNotificationState";
 import AccessibleButton from "../views/elements/AccessibleButton";
@@ -82,7 +81,6 @@ interface IState {
     isResending: boolean;
 }
 
-@replaceableComponent("structures.RoomStatusBar")
 export default class RoomStatusBar extends React.PureComponent<IProps, IState> {
     private unmounted = false;
     public static contextType = MatrixClientContext;

src/components/structures/RoomView.tsx

@@ -86,7 +86,6 @@ import { getKeyBindingsManager } from '../../KeyBindingsManager';
 import { objectHasDiff } from "../../utils/objects";
 import SpaceRoomView from "./SpaceRoomView";
 import { IOpts } from "../../createRoom";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import EditorStateTransfer from "../../utils/EditorStateTransfer";
 import ErrorDialog from '../views/dialogs/ErrorDialog';
 import SearchResultTile from '../views/rooms/SearchResultTile';
@@ -220,7 +219,6 @@ export interface IRoomState {
     narrow: boolean;
 }
 
-@replaceableComponent("structures.RoomView")
 export class RoomView extends React.Component<IRoomProps, IRoomState> {
     private readonly dispatcherRef: string;
     private readonly roomStoreToken: EventSubscription;

src/components/structures/ScrollPanel.tsx

@@ -19,7 +19,6 @@ import { logger } from "matrix-js-sdk/src/logger";
 
 import Timer from '../../utils/Timer';
 import AutoHideScrollbar from "./AutoHideScrollbar";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import { getKeyBindingsManager } from "../../KeyBindingsManager";
 import ResizeNotifier from "../../utils/ResizeNotifier";
 import { KeyBindingAction } from "../../accessibility/KeyboardShortcuts";
@@ -170,7 +169,6 @@ interface IPreventShrinkingState {
     offsetNode: HTMLElement;
 }
 
-@replaceableComponent("structures.ScrollPanel")
 export default class ScrollPanel extends React.Component<IProps> {
     static defaultProps = {
         stickyBottom: true,

src/components/structures/SearchBox.tsx

@@ -20,7 +20,6 @@ import { throttle } from 'lodash';
 import classNames from 'classnames';
 
 import AccessibleButton from '../../components/views/elements/AccessibleButton';
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import { getKeyBindingsManager } from "../../KeyBindingsManager";
 import { KeyBindingAction } from "../../accessibility/KeyboardShortcuts";
 
@@ -43,7 +42,6 @@ interface IState {
     blurred: boolean;
 }
 
-@replaceableComponent("structures.SearchBox")
 export default class SearchBox extends React.Component<IProps, IState> {
     private search = createRef<HTMLInputElement>();
 

src/components/structures/TabbedView.tsx

@@ -22,7 +22,6 @@ import { logger } from "matrix-js-sdk/src/logger";
 
 import { _t } from '../../languageHandler';
 import AutoHideScrollbar from './AutoHideScrollbar';
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import AccessibleButton from "../views/elements/AccessibleButton";
 import { PosthogScreenTracker, ScreenName } from "../../PosthogTrackers";
 
@@ -64,7 +63,6 @@ interface IState {
     activeTabIndex: number;
 }
 
-@replaceableComponent("structures.TabbedView")
 export default class TabbedView extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);

src/components/structures/ThreadView.tsx

@@ -25,7 +25,6 @@ import classNames from "classnames";
 
 import BaseCard from "../views/right_panel/BaseCard";
 import { RightPanelPhases } from "../../stores/right-panel/RightPanelStorePhases";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import ResizeNotifier from '../../utils/ResizeNotifier';
 import MessageComposer from '../views/rooms/MessageComposer';
 import { RoomPermalinkCreator } from '../../utils/permalinks/Permalinks';
@@ -72,7 +71,6 @@ interface IState {
     narrow: boolean;
 }
 
-@replaceableComponent("structures.ThreadView")
 export default class ThreadView extends React.Component<IProps, IState> {
     static contextType = RoomContext;
     public context!: React.ContextType<typeof RoomContext>;

src/components/structures/TimelinePanel.tsx

@@ -41,7 +41,6 @@ import { Action } from '../../dispatcher/actions';
 import Timer from '../../utils/Timer';
 import shouldHideEvent from '../../shouldHideEvent';
 import { haveTileForEvent } from "../views/rooms/EventTile";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import { arrayFastClone } from "../../utils/arrays";
 import MessagePanel from "./MessagePanel";
 import { IScrollState } from "./ScrollPanel";
@@ -211,7 +210,6 @@ interface IEventIndexOpts {
  *
  * Also responsible for handling and sending read receipts.
  */
-@replaceableComponent("structures.TimelinePanel")
 class TimelinePanel extends React.Component<IProps, IState> {
     static contextType = RoomContext;
 

src/components/structures/ToastContainer.tsx

@@ -18,14 +18,12 @@ import * as React from "react";
 import classNames from "classnames";
 
 import ToastStore, { IToast } from "../../stores/ToastStore";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 
 interface IState {
     toasts: IToast<any>[];
     countSeen: number;
 }
 
-@replaceableComponent("structures.ToastContainer")
 export default class ToastContainer extends React.Component<{}, IState> {
     constructor(props, context) {
         super(props, context);

src/components/structures/UploadBar.tsx

@@ -27,7 +27,6 @@ import { Action } from "../../dispatcher/actions";
 import ProgressBar from "../views/elements/ProgressBar";
 import AccessibleButton from "../views/elements/AccessibleButton";
 import { IUpload } from "../../models/IUpload";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 
 interface IProps {
@@ -40,7 +39,6 @@ interface IState {
     uploadsHere: IUpload[];
 }
 
-@replaceableComponent("structures.UploadBar")
 export default class UploadBar extends React.Component<IProps, IState> {
     static contextType = MatrixClientContext;
 

src/components/structures/UserMenu.tsx

@@ -53,7 +53,6 @@ import { UIFeature } from "../../settings/UIFeature";
 import HostSignupAction from "./HostSignupAction";
 import SpaceStore from "../../stores/spaces/SpaceStore";
 import { UPDATE_SELECTED_SPACE } from "../../stores/spaces";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import { SettingUpdatedPayload } from "../../dispatcher/payloads/SettingUpdatedPayload";
 import UserIdentifierCustomisations from "../../customisations/UserIdentifier";
@@ -143,7 +142,6 @@ const below = (rect: PartialDOMRect) => {
     };
 };
 
-@replaceableComponent("structures.UserMenu")
 export default class UserMenu extends React.Component<IProps, IState> {
     private dispatcherRef: string;
     private themeWatcherRef: string;

src/components/structures/UserView.tsx

@@ -23,7 +23,6 @@ import { MatrixClientPeg } from "../../MatrixClientPeg";
 import Modal from '../../Modal';
 import { _t } from '../../languageHandler';
 import HomePage from "./HomePage";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import ErrorDialog from "../views/dialogs/ErrorDialog";
 import MainSplit from "./MainSplit";
 import RightPanel from "./RightPanel";
@@ -41,7 +40,6 @@ interface IState {
     member?: RoomMember;
 }
 
-@replaceableComponent("structures.UserView")
 export default class UserView extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);

src/components/structures/ViewSource.tsx

@@ -24,7 +24,6 @@ import { _t } from "../../languageHandler";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import { canEditContent } from "../../utils/EventUtils";
 import { MatrixClientPeg } from '../../MatrixClientPeg';
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import { IDialogProps } from "../views/dialogs/IDialogProps";
 import BaseDialog from "../views/dialogs/BaseDialog";
 import { DevtoolsContext } from "../views/dialogs/devtools/BaseTool";
@@ -39,7 +38,6 @@ interface IState {
     isEditing: boolean;
 }
 
-@replaceableComponent("structures.ViewSource")
 export default class ViewSource extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);

src/components/structures/auth/CompleteSecurity.tsx

@@ -19,7 +19,6 @@ import React from 'react';
 import { _t } from '../../../languageHandler';
 import { SetupEncryptionStore, Phase } from '../../../stores/SetupEncryptionStore';
 import SetupEncryptionBody from "./SetupEncryptionBody";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import AccessibleButton from '../../views/elements/AccessibleButton';
 import CompleteSecurityBody from "../../views/auth/CompleteSecurityBody";
 import AuthPage from "../../views/auth/AuthPage";
@@ -33,7 +32,6 @@ interface IState {
     lostKeys: boolean;
 }
 
-@replaceableComponent("structures.auth.CompleteSecurity")
 export default class CompleteSecurity extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);

src/components/structures/auth/E2eSetup.tsx

@@ -19,7 +19,6 @@ import React from 'react';
 import AuthPage from '../../views/auth/AuthPage';
 import CompleteSecurityBody from '../../views/auth/CompleteSecurityBody';
 import CreateCrossSigningDialog from '../../views/dialogs/security/CreateCrossSigningDialog';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     onFinished: () => void;
@@ -27,7 +26,6 @@ interface IProps {
     tokenLogin?: boolean;
 }
 
-@replaceableComponent("structures.auth.E2eSetup")
 export default class E2eSetup extends React.Component<IProps> {
     render() {
         return (

src/components/structures/auth/ForgotPassword.tsx

@@ -28,7 +28,6 @@ import AuthPage from "../../views/auth/AuthPage";
 import ServerPicker from "../../views/elements/ServerPicker";
 import EmailField from "../../views/auth/EmailField";
 import PassphraseField from '../../views/auth/PassphraseField';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { PASSWORD_MIN_SCORE } from '../../views/auth/RegistrationForm';
 import InlineSpinner from '../../views/elements/InlineSpinner';
 import Spinner from "../../views/elements/Spinner";
@@ -81,7 +80,6 @@ enum ForgotPasswordField {
     PasswordConfirm = 'field_password_confirm',
 }
 
-@replaceableComponent("structures.auth.ForgotPassword")
 export default class ForgotPassword extends React.Component<IProps, IState> {
     private reset: PasswordReset;
 

src/components/structures/auth/Login.tsx

@@ -34,7 +34,6 @@ import InlineSpinner from "../../views/elements/InlineSpinner";
 import Spinner from "../../views/elements/Spinner";
 import SSOButtons from "../../views/elements/SSOButtons";
 import ServerPicker from "../../views/elements/ServerPicker";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import AuthBody from "../../views/auth/AuthBody";
 import AuthHeader from "../../views/auth/AuthHeader";
 import AccessibleButton from '../../views/elements/AccessibleButton';
@@ -103,7 +102,6 @@ interface IState {
 /*
  * A wire component which glues together login UI components and Login logic
  */
-@replaceableComponent("structures.auth.LoginComponent")
 export default class LoginComponent extends React.PureComponent<IProps, IState> {
     private unmounted = false;
     private loginLogic: Login;

src/components/structures/auth/Registration.tsx

@@ -30,7 +30,6 @@ import Login, { ISSOFlow } from "../../../Login";
 import dis from "../../../dispatcher/dispatcher";
 import SSOButtons from "../../views/elements/SSOButtons";
 import ServerPicker from '../../views/elements/ServerPicker';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import RegistrationForm from '../../views/auth/RegistrationForm';
 import AccessibleButton from '../../views/elements/AccessibleButton';
 import AuthBody from "../../views/auth/AuthBody";
@@ -110,7 +109,6 @@ interface IState {
     ssoFlow?: ISSOFlow;
 }
 
-@replaceableComponent("structures.auth.Registration")
 export default class Registration extends React.Component<IProps, IState> {
     loginLogic: Login;
 

src/components/structures/auth/SetupEncryptionBody.tsx

@@ -25,7 +25,6 @@ import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import Modal from '../../../Modal';
 import VerificationRequestDialog from '../../views/dialogs/VerificationRequestDialog';
 import { SetupEncryptionStore, Phase } from '../../../stores/SetupEncryptionStore';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import EncryptionPanel from "../../views/right_panel/EncryptionPanel";
 import AccessibleButton from '../../views/elements/AccessibleButton';
 import Spinner from '../../views/elements/Spinner';
@@ -49,7 +48,6 @@ interface IState {
     lostKeys: boolean;
 }
 
-@replaceableComponent("structures.auth.SetupEncryptionBody")
 export default class SetupEncryptionBody extends React.Component<IProps, IState> {
     constructor(props) {
         super(props);

src/components/structures/auth/SoftLogout.tsx

@@ -27,7 +27,6 @@ import { ISSOFlow, LoginFlow, sendLoginRequest } from "../../../Login";
 import AuthPage from "../../views/auth/AuthPage";
 import { SSO_HOMESERVER_URL_KEY, SSO_ID_SERVER_URL_KEY } from "../../../BasePlatform";
 import SSOButtons from "../../views/elements/SSOButtons";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import ConfirmWipeDeviceDialog from '../../views/dialogs/ConfirmWipeDeviceDialog';
 import Field from '../../views/elements/Field';
 import AccessibleButton from '../../views/elements/AccessibleButton';
@@ -70,7 +69,6 @@ interface IState {
     flows: LoginFlow[];
 }
 
-@replaceableComponent("structures.auth.SoftLogout")
 export default class SoftLogout extends React.Component<IProps, IState> {
     public constructor(props: IProps) {
         super(props);