diff --git a/vector/src/main/res/layout/fragment_login_account_created.xml b/vector/src/main/res/layout/fragment_login_account_created.xml
deleted file mode 100644
index 2f02da71d7..0000000000
--- a/vector/src/main/res/layout/fragment_login_account_created.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/login_fragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
-
-    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
-
-        <LinearLayout style="@style/LoginFormContainer">
-
-            <ImageView
-                style="@style/LoginLogo"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                style="@style/Widget.Vector.TextView.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_account_created_title"
-                android:textColor="?vctr_content_primary" />
-
-            <TextView
-                android:id="@+id/loginAccountCreatedSubtitle"
-                style="@style/Widget.Vector.TextView.Body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textColor="?vctr_content_primary"
-                tools:text="@string/login_account_created_subtitle" />
-
-            <TextView
-                style="@style/Widget.Vector.TextView.Body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:text="@string/login_account_created_notice"
-                android:textColor="?vctr_content_secondary" />
-
-            <TextView
-                style="@style/Widget.Vector.TextView.Body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_account_created_notice_2"
-                android:textColor="?vctr_content_secondary" />
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/loginAccountCreatedMessage"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:background="@drawable/bg_login_server_selector"
-                android:padding="4dp">
-
-                <ImageView
-                    android:id="@+id/loginAccountCreatedAvatar"
-                    android:layout_width="44dp"
-                    android:layout_height="44dp"
-                    android:importantForAccessibility="no"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    tools:src="@tools:sample/avatars" />
-
-                <TextView
-                    android:id="@+id/loginAccountCreatedMemberName"
-                    style="@style/Widget.Vector.TextView.Subtitle"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginTop="2dp"
-                    android:layout_marginEnd="4dp"
-                    android:ellipsize="end"
-                    android:maxLines="1"
-                    android:textColor="?vctr_content_primary"
-                    android:textStyle="bold"
-                    app:layout_constraintEnd_toStartOf="@id/loginAccountCreatedTime"
-                    app:layout_constraintStart_toEndOf="@id/loginAccountCreatedAvatar"
-                    app:layout_constraintTop_toTopOf="parent"
-                    tools:text="\@user:domain.org" />
-
-                <TextView
-                    android:id="@+id/loginAccountCreatedTime"
-                    style="@style/Widget.Vector.TextView.Caption"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:textColor="?vctr_content_secondary"
-                    app:layout_constraintBaseline_toBaselineOf="@id/loginAccountCreatedMemberName"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    tools:text="@tools:sample/date/hhmm" />
-
-                <TextView
-                    style="@style/Widget.Vector.TextView.Body"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:text="@string/login_account_created_message"
-                    android:textColor="?vctr_content_primary"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="@id/loginAccountCreatedMemberName"
-                    app:layout_constraintTop_toBottomOf="@id/loginAccountCreatedMemberName" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <TextView
-                style="@style/Widget.Vector.TextView.Body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_account_created_instruction"
-                android:textColor="?vctr_content_secondary" />
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp">
-
-                <Button
-                    android:id="@+id/loginAccountCreatedLater"
-                    style="@style/Widget.Vector.Button.Text.Login"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    android:text="@string/later" />
-
-                <Button
-                    android:id="@+id/loginAccountCreatedDone"
-                    style="@style/Widget.Vector.Button.Login"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    android:text="@string/done"
-                    android:visibility="gone"
-                    tools:layout_marginEnd="120dp"
-                    tools:visibility="visible" />
-
-            </FrameLayout>
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</FrameLayout>
-
diff --git a/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml b/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml
deleted file mode 100644
index a5b65d62f5..0000000000
--- a/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/login_fragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
-
-    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
-
-        <LinearLayout style="@style/LoginFormContainer">
-
-            <ImageView
-                style="@style/LoginLogo"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                android:id="@+id/loginGenericTextInputFormTitle"
-                style="@style/Widget.Vector.TextView.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textColor="?vctr_content_primary"
-                tools:text="@string/login_set_email_title_2" />
-
-            <TextView
-                android:id="@+id/loginGenericTextInputFormNotice"
-                style="@style/Widget.Vector.TextView.Body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:layout_marginBottom="@dimen/layout_vertical_margin"
-                android:gravity="start"
-                android:textColor="?vctr_content_secondary"
-                tools:text="@string/login_set_email_notice_2" />
-
-            <TextView
-                android:id="@+id/loginGenericTextInputFormMandatoryNotice"
-                style="@style/Widget.Vector.TextView.Caption"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="26dp"
-                android:gravity="start"
-                android:textColor="?vctr_content_secondary"
-                android:visibility="gone"
-                tools:text="@string/login_set_email_mandatory_notice_2"
-                tools:visibility="visible" />
-
-            <TextView
-                android:id="@+id/loginGenericTextInputFormNotice2"
-                style="@style/Widget.Vector.TextView.Caption"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="start"
-                android:textColor="?vctr_content_secondary"
-                android:visibility="gone"
-                tools:text="@string/login_set_msisdn_notice2"
-                tools:visibility="visible" />
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/loginGenericTextInputFormTil"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:errorEnabled="true"
-                tools:hint="@string/login_set_email_optional_hint">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/loginGenericTextInputFormTextInput"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:imeOptions="actionDone"
-                    android:maxLines="1"
-                    tools:inputType="textEmailAddress" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp">
-
-                <Button
-                    android:id="@+id/loginGenericTextInputFormOtherButton"
-                    style="@style/Widget.Vector.Button.Text.Login"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="start"
-                    android:visibility="gone"
-                    tools:text="@string/login_msisdn_confirm_send_again"
-                    tools:visibility="visible" />
-
-                <Button
-                    android:id="@+id/loginGenericTextInputFormLater"
-                    style="@style/Widget.Vector.Button.Text.Login"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    android:text="@string/later"
-                    android:visibility="gone"
-                    tools:layout_marginEnd="100dp"
-                    tools:visibility="visible" />
-
-                <Button
-                    android:id="@+id/loginGenericTextInputFormSubmit"
-                    style="@style/Widget.Vector.Button.Login"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    android:enabled="false"
-                    tools:ignore="RelativeOverlap"
-                    tools:text="@string/login_set_email_submit" />
-
-            </FrameLayout>
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</FrameLayout>
-
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_2.xml b/vector/src/main/res/layout/fragment_login_reset_password_2.xml
deleted file mode 100644
index 6a2dad569c..0000000000
--- a/vector/src/main/res/layout/fragment_login_reset_password_2.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
-
-    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
-
-        <LinearLayout style="@style/LoginFormContainer">
-
-            <ImageView
-                style="@style/LoginLogo"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                android:id="@+id/resetPasswordTitle"
-                style="@style/Widget.Vector.TextView.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textColor="?vctr_content_primary"
-                tools:text="@string/login_reset_password_on" />
-
-            <TextView
-                style="@style/Widget.Vector.TextView.Subtitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginTop="32dp"
-                android:text="@string/login_enter_your_email"
-                android:textColor="?vctr_content_primary" />
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/resetPasswordEmailTil"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:hint="@string/login_reset_password_email_hint"
-                app:errorEnabled="true">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/resetPasswordEmail"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:inputType="textEmailAddress"
-                    android:maxLines="1" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <TextView
-                android:id="@+id/loginNotice"
-                style="@style/Widget.Vector.TextView.Caption"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:gravity="start"
-                android:text="@string/login_reset_password_notice"
-                android:textColor="?vctr_content_secondary" />
-
-            <TextView
-                style="@style/Widget.Vector.TextView.Subtitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginTop="16dp"
-                android:text="@string/login_choose_a_new_password"
-                android:textColor="?vctr_content_primary" />
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/passwordFieldTil"
-                style="@style/Widget.Vector.TextInputLayout.Password"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:hint="@string/login_reset_password_password_hint"
-                app:errorEnabled="true"
-                app:errorIconDrawable="@null">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/passwordField"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:ems="10"
-                    android:imeOptions="actionDone"
-                    android:inputType="textPassword"
-                    android:maxLines="1"
-                    android:paddingEnd="48dp"
-                    tools:ignore="RtlSymmetry" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <Button
-                android:id="@+id/resetPasswordSubmit"
-                style="@style/Widget.Vector.Button.Login"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:text="@string/login_reset_password_submit"
-                tools:ignore="RelativeOverlap" />
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</FrameLayout>
-
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml
deleted file mode 100644
index fa3aa74285..0000000000
--- a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
-
-    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
-
-        <LinearLayout style="@style/LoginFormContainer">
-
-            <ImageView
-                style="@style/LoginLogo"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                style="@style/Widget.Vector.TextView.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_reset_password_mail_confirmation_title"
-                android:textColor="?vctr_content_primary" />
-
-            <TextView
-                android:id="@+id/resetPasswordMailConfirmationNotice"
-                style="@style/Widget.Vector.TextView.Body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textColor="?vctr_content_secondary"
-                tools:text="@string/login_reset_password_mail_confirmation_notice" />
-
-            <TextView
-                style="@style/Widget.Vector.TextView.Caption"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_reset_password_mail_confirmation_notice_2"
-                android:textColor="?vctr_content_secondary" />
-
-            <Button
-                android:id="@+id/resetPasswordMailConfirmationSubmit"
-                style="@style/Widget.Vector.Button.Login"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:layout_marginTop="32dp"
-                android:text="@string/login_reset_password_mail_confirmation_submit" />
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</FrameLayout>
-
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml b/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml
deleted file mode 100644
index d0e7a447cc..0000000000
--- a/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
-
-    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
-
-        <LinearLayout style="@style/LoginFormContainer">
-
-            <ImageView
-                style="@style/LoginLogo"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                style="@style/Widget.Vector.TextView.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_reset_password_success_title"
-                android:textColor="?vctr_content_primary" />
-
-            <TextView
-                android:id="@+id/resetPasswordSuccessNotice"
-                style="@style/Widget.Vector.TextView.Subtitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_reset_password_success_notice"
-                android:textColor="?vctr_content_primary" />
-
-            <TextView
-                style="@style/Widget.Vector.TextView.Body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_reset_password_success_notice_2"
-                android:textColor="?vctr_content_secondary" />
-
-            <Button
-                android:id="@+id/resetPasswordSuccessSubmit"
-                style="@style/Widget.Vector.Button.Login"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:layout_marginTop="32dp"
-                android:text="@string/login_reset_password_success_submit" />
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</FrameLayout>
-
diff --git a/vector/src/main/res/layout/fragment_login_server_selection_2.xml b/vector/src/main/res/layout/fragment_login_server_selection_2.xml
deleted file mode 100644
index 9113e5e84b..0000000000
--- a/vector/src/main/res/layout/fragment_login_server_selection_2.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
-
-    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
-
-        <LinearLayout style="@style/LoginFormContainer">
-
-            <ImageView
-                style="@style/LoginLogo"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                android:id="@+id/loginServerTitle"
-                style="@style/Widget.Vector.TextView.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_please_choose_a_server"
-                android:textColor="?vctr_content_primary"
-                tools:ignore="UnknownId" />
-
-            <TextView
-                android:id="@+id/loginServerText"
-                style="@style/Widget.Vector.TextView.Body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:gravity="start"
-                android:text="@string/login_server_text"
-                android:textColor="?vctr_content_secondary" />
-
-            <!-- Use a CheckableConstraintLayout to keep the pressed state when retrieving login flow -->
-            <im.vector.app.core.platform.CheckableConstraintLayout
-                android:id="@+id/loginServerChoiceMatrixOrg"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:background="@drawable/bg_login_server_selector"
-                android:contentDescription="@string/login_a11y_choose_matrix_org"
-                android:minHeight="80dp"
-                android:paddingStart="@dimen/layout_horizontal_margin"
-                android:paddingEnd="@dimen/layout_horizontal_margin">
-
-                <ImageView
-                    android:id="@+id/loginServerChoiceMatrixOrgIcon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:importantForAccessibility="no"
-                    android:src="@drawable/ic_logo_matrix_org"
-                    app:layout_constraintBottom_toTopOf="@id/loginServerChoiceMatrixOrgText"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintVertical_chainStyle="packed"
-                    app:tint="?vctr_content_primary"
-                    tools:ignore="MissingPrefix" />
-
-                <TextView
-                    android:id="@+id/loginServerChoiceMatrixOrgText"
-                    style="@style/Widget.Vector.TextView.Caption"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:gravity="start"
-                    android:text="@string/login_server_matrix_org_text"
-                    android:textColor="?vctr_content_secondary"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/loginServerChoiceMatrixOrgIcon" />
-
-            </im.vector.app.core.platform.CheckableConstraintLayout>
-
-            <TextView
-                android:id="@+id/loginServerText2"
-                style="@style/Widget.Vector.TextView.Caption"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:text="@string/login_if_you_re_not_sure_select_this_option"
-                android:textColor="?vctr_content_secondary"
-                android:textStyle="italic" />
-
-            <im.vector.app.core.platform.CheckableConstraintLayout
-                android:id="@+id/loginServerChoiceOther"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:background="@drawable/bg_login_server_selector"
-                android:contentDescription="@string/login_a11y_choose_other"
-                android:minHeight="80dp"
-                android:paddingStart="@dimen/layout_horizontal_margin"
-                android:paddingEnd="@dimen/layout_horizontal_margin">
-
-                <TextView
-                    android:id="@+id/loginServerChoiceOtherTitle"
-                    style="@style/Widget.Vector.TextView.Subtitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="start"
-                    android:text="@string/login_element_matrix_server_and_others"
-                    android:textColor="?vctr_content_primary"
-                    app:layout_constraintBottom_toTopOf="@id/loginServerChoiceOtherText"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintVertical_chainStyle="packed" />
-
-                <TextView
-                    android:id="@+id/loginServerChoiceOtherText"
-                    style="@style/Widget.Vector.TextView.Caption"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:gravity="start"
-                    android:text="@string/login_server_other_text"
-                    android:textColor="?vctr_content_secondary"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/loginServerChoiceOtherTitle" />
-
-            </im.vector.app.core.platform.CheckableConstraintLayout>
-
-            <TextView
-                android:id="@+id/loginServerChoiceEmsLearnMore"
-                style="@style/Widget.Vector.TextView.Caption"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="32dp"
-                android:paddingTop="16dp"
-                android:paddingBottom="16dp"
-                android:text="@string/login_server_modular_learn_more_about_ems"
-                android:textColor="?vctr_content_secondary"
-                app:layout_constraintBottom_toBottomOf="@id/loginServerChoiceEmsText"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@id/loginServerChoiceEmsText" />
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</FrameLayout>
-
diff --git a/vector/src/main/res/layout/fragment_login_server_url_form_2.xml b/vector/src/main/res/layout/fragment_login_server_url_form_2.xml
deleted file mode 100644
index 6038cfaedd..0000000000
--- a/vector/src/main/res/layout/fragment_login_server_url_form_2.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/login_fragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
-
-    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
-
-        <LinearLayout style="@style/LoginFormContainer">
-
-            <ImageView
-                style="@style/LoginLogo"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                android:id="@+id/loginServerUrlFormTitle"
-                style="@style/Widget.Vector.TextView.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_server_url_form_common_notice"
-                android:textColor="?vctr_content_primary" />
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/loginServerUrlFormHomeServerUrlTil"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="26dp"
-                app:errorEnabled="true"
-                tools:hint="@string/login_server_url_form_modular_hint">
-
-                <AutoCompleteTextView
-                    android:id="@+id/loginServerUrlFormHomeServerUrl"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/hs_url"
-                    android:imeOptions="actionDone"
-                    android:inputType="textUri"
-                    android:maxLines="1" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <TextView
-                android:id="@+id/loginServerUrlFormClearHistory"
-                style="@style/Widget.Vector.TextView.Caption"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:paddingStart="16dp"
-                android:paddingEnd="0dp"
-                android:paddingBottom="16dp"
-                android:text="@string/login_clear_homeserver_history"
-                android:textColor="?colorPrimary"
-                android:visibility="invisible"
-                tools:visibility="visible" />
-
-            <Button
-                android:id="@+id/loginServerUrlFormSubmit"
-                style="@style/Widget.Vector.Button.Login"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:layout_marginTop="4dp"
-                android:text="@string/login_continue" />
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</FrameLayout>
-
diff --git a/vector/src/main/res/layout/fragment_login_signin_password_2.xml b/vector/src/main/res/layout/fragment_login_signin_password_2.xml
deleted file mode 100644
index c70982f209..0000000000
--- a/vector/src/main/res/layout/fragment_login_signin_password_2.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/login_fragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
-
-    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
-
-        <LinearLayout style="@style/LoginFormContainer">
-
-            <ImageView
-                style="@style/LoginLogo"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                style="@style/Widget.Vector.TextView.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_please_enter_your_password"
-                android:textColor="?vctr_content_primary" />
-
-            <ImageView
-                android:id="@+id/loginUserIcon"
-                android:layout_width="92dp"
-                android:layout_height="92dp"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:importantForAccessibility="no"
-                tools:ignore="MissingPrefix"
-                tools:src="@tools:sample/avatars" />
-
-            <TextView
-                android:id="@+id/loginWelcomeBack"
-                style="@style/Widget.Vector.TextView.Body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textColor="?vctr_content_secondary"
-                tools:text="Welcome back user!" />
-
-            <TextView
-                android:id="@+id/loginWelcomeBackWarning"
-                style="@style/Widget.Vector.TextView.Body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_unknown_user_warning"
-                android:textColor="@color/vector_warning_color_2"
-                android:visibility="gone"
-                tools:visibility="visible" />
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/passwordFieldTil"
-                style="@style/Widget.Vector.TextInputLayout.Password"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:hint="@string/login_signup_password_hint"
-                app:errorEnabled="true"
-                app:errorIconDrawable="@null">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/passwordField"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:ems="10"
-                    android:imeOptions="actionDone"
-                    android:inputType="textPassword"
-                    android:maxLines="1"
-                    android:paddingEnd="48dp"
-                    tools:ignore="RtlSymmetry" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin">
-
-                <Button
-                    android:id="@+id/forgetPasswordButton"
-                    style="@style/Widget.Vector.Button.Text.Login"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="start"
-                    android:paddingStart="0dp"
-                    android:paddingEnd="0dp"
-                    android:text="@string/auth_forgot_password" />
-
-                <Button
-                    android:id="@+id/loginSubmit"
-                    style="@style/Widget.Vector.Button.Login"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    android:text="@string/auth_login"
-                    tools:enabled="false"
-                    tools:ignore="RelativeOverlap" />
-
-            </FrameLayout>
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</FrameLayout>
-
diff --git a/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml b/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
deleted file mode 100644
index 61f565e093..0000000000
--- a/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/login_fragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
-
-    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
-
-        <LinearLayout style="@style/LoginFormContainer">
-
-            <ImageView
-                style="@style/LoginLogo"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                android:id="@+id/loginTitle"
-                style="@style/Widget.Vector.TextView.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textColor="?vctr_content_primary"
-                tools:text="@string/login_signin_to" />
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/loginFieldTil"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:hint="@string/login_signin_username_hint"
-                app:errorEnabled="true">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/loginField"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:inputType="textEmailAddress"
-                    android:maxLines="1" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/passwordFieldTil"
-                style="@style/Widget.Vector.TextInputLayout.Password"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:hint="@string/login_signup_password_hint"
-                app:errorEnabled="true"
-                app:errorIconDrawable="@null">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/passwordField"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:ems="10"
-                    android:imeOptions="actionDone"
-                    android:inputType="textPassword"
-                    android:maxLines="1"
-                    android:paddingEnd="48dp"
-                    tools:ignore="RtlSymmetry" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin">
-
-                <Button
-                    android:id="@+id/forgetPasswordButton"
-                    style="@style/Widget.Vector.Button.Text.Login"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="start"
-                    android:paddingStart="0dp"
-                    android:paddingEnd="0dp"
-                    android:text="@string/auth_forgot_password" />
-
-                <Button
-                    android:id="@+id/loginSubmit"
-                    style="@style/Widget.Vector.Button.Login"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    android:text="@string/auth_login"
-                    tools:enabled="false"
-                    tools:ignore="RelativeOverlap" />
-
-            </FrameLayout>
-
-            <!-- Social Logins buttons -->
-            <LinearLayout
-                android:id="@+id/loginSocialLoginContainer"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:orientation="vertical"
-                android:visibility="gone"
-                tools:visibility="visible">
-
-                <TextView
-                    android:id="@+id/loginSocialLoginHeader"
-                    style="@style/Widget.Vector.TextView.Body"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:gravity="center"
-                    android:text="@string/login_social_continue"
-                    android:textColor="?vctr_content_secondary" />
-
-                <im.vector.app.features.login.SocialLoginButtonsView
-                    android:id="@+id/loginSocialLoginButtons"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    tools:signMode="signin" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</FrameLayout>
-
diff --git a/vector/src/main/res/layout/fragment_login_signin_username_2.xml b/vector/src/main/res/layout/fragment_login_signin_username_2.xml
deleted file mode 100644
index acba8dd7e1..0000000000
--- a/vector/src/main/res/layout/fragment_login_signin_username_2.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/login_fragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
-
-    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
-
-        <LinearLayout style="@style/LoginFormContainer">
-
-            <ImageView
-                style="@style/LoginLogo"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                android:id="@+id/loginTitle"
-                style="@style/Widget.Vector.TextView.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_please_enter_your_matrix_identifier"
-                android:textColor="?vctr_content_primary" />
-
-            <TextView
-                android:id="@+id/loginSubtitle"
-                style="@style/Widget.Vector.TextView.Body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_please_enter_your_matrix_identifier_help"
-                android:textColor="?vctr_content_secondary" />
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/loginFieldTil"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:hint="@string/login_signin_matrix_id_hint"
-                app:errorEnabled="true">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/loginField"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:inputType="textEmailAddress"
-                    android:maxLines="1" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <Button
-                android:id="@+id/loginSubmit"
-                style="@style/Widget.Vector.Button.Login"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:text="@string/_continue"
-                tools:enabled="false" />
-
-            <TextView
-                android:id="@+id/loginServerText3"
-                style="@style/Widget.Vector.TextView.Caption"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:gravity="start"
-                android:text="@string/login_enter_identifier_help"
-                android:textColor="?vctr_content_secondary" />
-
-            <Button
-                android:id="@+id/loginChooseAServer"
-                style="@style/Widget.Vector.Button.Text.Login"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:text="@string/login_choose_a_server" />
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</FrameLayout>
diff --git a/vector/src/main/res/layout/fragment_login_signup_password_2.xml b/vector/src/main/res/layout/fragment_login_signup_password_2.xml
deleted file mode 100644
index 33730e92cb..0000000000
--- a/vector/src/main/res/layout/fragment_login_signup_password_2.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/login_fragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
-
-    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
-
-        <LinearLayout style="@style/LoginFormContainer">
-
-            <ImageView
-                style="@style/LoginLogo"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                style="@style/Widget.Vector.TextView.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_please_choose_a_password"
-                android:textColor="?vctr_content_primary" />
-
-            <TextView
-                style="@style/Widget.Vector.TextView.Subtitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:text="@string/login_your_matrix_identifier"
-                android:textColor="?vctr_content_primary" />
-
-            <TextView
-                android:id="@+id/loginMatrixIdentifier"
-                style="@style/Widget.Vector.TextView.Body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:textColor="?vctr_content_secondary"
-                tools:text="\@user:domain.org" />
-
-            <TextView
-                style="@style/Widget.Vector.TextView.Caption"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:text="@string/login_press_back_to_change"
-                android:textColor="?vctr_content_secondary"
-                android:textStyle="italic" />
-
-            <TextView
-                style="@style/Widget.Vector.TextView.Subtitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_choose_a_password"
-                android:textColor="?vctr_content_primary" />
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/passwordFieldTil"
-                style="@style/Widget.Vector.TextInputLayout.Password"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:hint="@string/login_signup_password_hint"
-                app:errorEnabled="true"
-                app:errorIconDrawable="@null">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/passwordField"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:ems="10"
-                    android:imeOptions="actionDone"
-                    android:inputType="textPassword"
-                    android:maxLines="1"
-                    android:paddingEnd="48dp"
-                    tools:ignore="RtlSymmetry" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <Button
-                android:id="@+id/loginSubmit"
-                style="@style/Widget.Vector.Button.Login"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:text="@string/_continue"
-                tools:enabled="false"
-                tools:ignore="RelativeOverlap" />
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</FrameLayout>
-
diff --git a/vector/src/main/res/layout/fragment_login_signup_username_2.xml b/vector/src/main/res/layout/fragment_login_signup_username_2.xml
deleted file mode 100644
index 6eeff13d86..0000000000
--- a/vector/src/main/res/layout/fragment_login_signup_username_2.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/login_fragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
-
-    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
-
-        <LinearLayout style="@style/LoginFormContainer">
-
-            <ImageView
-                style="@style/LoginLogo"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                android:id="@+id/loginTitle"
-                style="@style/Widget.Vector.TextView.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_please_choose_a_user_name"
-                android:textColor="?vctr_content_primary" />
-
-            <TextView
-                android:id="@+id/loginSubtitle"
-                style="@style/Widget.Vector.TextView.Body"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:textColor="?vctr_content_secondary"
-                tools:text="@string/login_signup_to" />
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/loginFieldTil"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:hint="@string/login_signup_username_hint"
-                app:errorEnabled="true">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/loginField"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:inputType="textEmailAddress"
-                    android:maxLines="1" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <TextView
-                android:id="@+id/loginChooseHelp"
-                style="@style/Widget.Vector.TextView.Caption"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/login_please_choose_a_user_name_help_2"
-                android:textColor="?vctr_content_secondary"
-                android:textStyle="italic" />
-
-            <Button
-                android:id="@+id/loginSubmit"
-                style="@style/Widget.Vector.Button.Login"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:layout_marginTop="8dp"
-                android:text="@string/_continue"
-                tools:enabled="false" />
-
-            <!-- SSO Option -->
-            <!-- Social Logins buttons -->
-            <LinearLayout
-                android:id="@+id/loginSocialLoginContainer"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:orientation="vertical"
-                android:visibility="gone"
-                tools:visibility="visible">
-
-                <TextView
-                    android:id="@+id/loginSocialLoginHeader"
-                    style="@style/Widget.Vector.TextView.Body"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:gravity="center"
-                    android:text="@string/login_social_continue"
-                    android:textColor="?vctr_content_secondary" />
-
-                <im.vector.app.features.login.SocialLoginButtonsView
-                    android:id="@+id/loginSocialLoginButtons"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    tools:signMode="signin" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</FrameLayout>
diff --git a/vector/src/main/res/layout/fragment_login_splash_2.xml b/vector/src/main/res/layout/fragment_login_splash_2.xml
deleted file mode 100644
index b7010ba4da..0000000000
--- a/vector/src/main/res/layout/fragment_login_splash_2.xml
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground"
-    android:paddingStart="36dp"
-    android:paddingTop="@dimen/layout_vertical_margin"
-    android:paddingEnd="36dp"
-    android:paddingBottom="@dimen/layout_vertical_margin">
-
-    <!-- Strategy: Spaces are used to spread the remaining space, using weight -->
-
-    <Space
-        android:id="@+id/loginSplashSpace1"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/loginSplashLogoContainer"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="spread_inside"
-        app:layout_constraintVertical_weight="4" />
-
-    <LinearLayout
-        android:id="@+id/loginSplashLogoContainer"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toTopOf="@id/loginSplashSpace2"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/loginSplashSpace1">
-
-        <ImageView
-            android:id="@+id/loginSplashLogo"
-            android:layout_width="64dp"
-            android:layout_height="64dp"
-            android:importantForAccessibility="no"
-            android:src="@drawable/element_logo_green"
-            android:transitionName="loginLogoTransition" />
-
-        <ImageView
-            android:id="@+id/logoType"
-            android:layout_width="wrap_content"
-            android:layout_height="44dp"
-            android:layout_marginTop="8dp"
-            android:contentDescription="@string/app_name"
-            android:src="@drawable/element_logotype"
-            app:tint="?colorSecondary"
-            tools:ignore="MissingPrefix" />
-
-    </LinearLayout>
-
-    <Space
-        android:id="@+id/loginSplashSpace2"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/loginSplashTitle"
-        app:layout_constraintTop_toBottomOf="@id/loginSplashLogoContainer"
-        app:layout_constraintVertical_weight="1" />
-
-    <TextView
-        android:id="@+id/loginSplashTitle"
-        style="@style/Widget.Vector.TextView.Title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:text="@string/login_splash_title"
-        android:textColor="?vctr_content_primary"
-        android:transitionName="loginTitleTransition"
-        app:layout_constraintBottom_toTopOf="@id/loginSplashSpace25"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/loginSplashSpace2" />
-
-    <Space
-        android:id="@+id/loginSplashSpace25"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/loginSplashContent"
-        app:layout_constraintTop_toBottomOf="@id/loginSplashTitle"
-        app:layout_constraintVertical_weight="3" />
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/loginSplashContent"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@id/loginSplashSpace3"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/loginSplashSpace25">
-
-        <ImageView
-            android:id="@+id/loginSplashPicto1"
-            android:layout_width="32dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="2dp"
-            android:importantForAccessibility="no"
-            android:src="@drawable/ic_login_splash_message_circle"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/loginSplashText1"
-            app:tint="?vctr_content_secondary"
-            tools:ignore="MissingPrefix" />
-
-        <TextView
-            android:id="@+id/loginSplashText1"
-            style="@style/Widget.Vector.TextView.Body"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:gravity="start"
-            android:text="@string/login_splash_text1"
-            android:textColor="?vctr_content_secondary"
-            app:layout_constraintBottom_toTopOf="@id/loginSplashText2"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/loginSplashPicto1"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:id="@+id/loginSplashPicto2"
-            android:layout_width="32dp"
-            android:layout_height="wrap_content"
-            android:importantForAccessibility="no"
-            android:src="@drawable/ic_login_splash_lock"
-            app:layout_constraintStart_toStartOf="@id/loginSplashPicto1"
-            app:layout_constraintTop_toTopOf="@id/loginSplashText2"
-            app:tint="?vctr_content_secondary"
-            tools:ignore="MissingPrefix" />
-
-        <TextView
-            android:id="@+id/loginSplashText2"
-            style="@style/Widget.Vector.TextView.Body"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:gravity="start"
-            android:text="@string/login_splash_text2"
-            android:textColor="?vctr_content_secondary"
-            app:layout_constraintBottom_toTopOf="@id/loginSplashText3"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@id/loginSplashText1"
-            app:layout_constraintTop_toBottomOf="@id/loginSplashText1" />
-
-        <ImageView
-            android:id="@+id/loginSplashPicto3"
-            android:layout_width="32dp"
-            android:layout_height="wrap_content"
-            android:importantForAccessibility="no"
-            android:src="@drawable/ic_login_splash_sliders"
-            app:layout_constraintStart_toStartOf="@id/loginSplashPicto1"
-            app:layout_constraintTop_toTopOf="@id/loginSplashText3"
-            app:tint="?vctr_content_secondary"
-            tools:ignore="MissingPrefix" />
-
-        <TextView
-            android:id="@+id/loginSplashText3"
-            style="@style/Widget.Vector.TextView.Body"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:gravity="start"
-            android:text="@string/login_splash_text3"
-            android:textColor="?vctr_content_secondary"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@id/loginSplashText1"
-            app:layout_constraintTop_toBottomOf="@id/loginSplashText2" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <Space
-        android:id="@+id/loginSplashSpace3"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/loginFormContent"
-        app:layout_constraintTop_toBottomOf="@id/loginSplashContent"
-        app:layout_constraintVertical_weight="3" />
-
-    <LinearLayout
-        android:id="@+id/loginFormContent"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toTopOf="@id/loginSplashSpace5"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/loginSplashSpace3">
-
-        <Button
-            android:id="@+id/loginSignupSigninSignUp"
-            style="@style/Widget.Vector.Button.Login"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="@string/login_create_a_new_account" />
-
-        <Button
-            android:id="@+id/loginSignupSigninSignIn"
-            style="@style/Widget.Vector.Button.Text.Login"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginTop="14dp"
-            android:text="@string/login_i_already_have_an_account" />
-
-    </LinearLayout>
-
-    <Space
-        android:id="@+id/loginSplashSpace5"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/loginFormContent"
-        app:layout_constraintVertical_weight="6" />
-
-    <TextView
-        android:id="@+id/loginSplashVersion"
-        style="@style/Widget.Vector.TextView.Caption"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:drawablePadding="12dp"
-        android:textColor="?vctr_content_secondary"
-        android:visibility="gone"
-        app:drawableStartCompat="@drawable/ic_debug_icon"
-        app:drawableTint="?colorPrimary"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        tools:text="@string/settings_version"
-        tools:visibility="visible" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_login_sso_only_2.xml b/vector/src/main/res/layout/fragment_login_sso_only_2.xml
deleted file mode 100644
index baa05ee30f..0000000000
--- a/vector/src/main/res/layout/fragment_login_sso_only_2.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
-
-    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
-
-        <LinearLayout style="@style/LoginFormContainer">
-
-            <ImageView
-                style="@style/LoginLogo"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                android:id="@+id/loginSignupSigninTitle"
-                style="@style/Widget.Vector.TextView.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textColor="?vctr_content_primary"
-                tools:ignore="UnknownId"
-                tools:text="@string/login_connect_to" />
-
-            <Button
-                android:id="@+id/loginSignupSigninSubmit"
-                style="@style/Widget.Vector.Button.Login"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:layout_marginTop="38dp"
-                android:text="@string/login_signin_sso" />
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</FrameLayout>
-
diff --git a/vector/src/main/res/layout/fragment_login_terms_2.xml b/vector/src/main/res/layout/fragment_login_terms_2.xml
deleted file mode 100644
index 18b7df3880..0000000000
--- a/vector/src/main/res/layout/fragment_login_terms_2.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        style="@style/LoginFormScrollView"
-        android:layout_height="match_parent"
-        tools:ignore="MissingConstraints">
-
-        <ImageView
-            style="@style/LoginLogo"
-            android:layout_marginTop="36dp"
-            android:importantForAccessibility="no"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/loginTermsTitle"
-            style="@style/Widget.Vector.TextView.Title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="36dp"
-            android:layout_marginTop="52dp"
-            android:layout_marginEnd="36dp"
-            android:text="@string/login_terms_title"
-            android:textColor="?vctr_content_primary"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/loginLogo"
-            tools:ignore="UnknownId" />
-
-        <TextView
-            android:id="@+id/loginTermsNotice"
-            style="@style/Widget.Vector.TextView.Body"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:paddingStart="36dp"
-            android:paddingEnd="36dp"
-            android:text="@string/auth_accept_policies"
-            android:textColor="?vctr_content_secondary"
-            app:layout_constraintTop_toBottomOf="@id/loginTermsTitle" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/loginTermsPolicyList"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="16dp"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            app:layout_constraintBottom_toTopOf="@id/loginTermsSubmit"
-            app:layout_constraintTop_toBottomOf="@id/loginTermsNotice"
-            tools:listitem="@layout/item_policy" />
-
-        <Button
-            android:id="@+id/loginTermsSubmit"
-            style="@style/Widget.Vector.Button.Login"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="36dp"
-            android:text="@string/action_accept"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</FrameLayout>
-
diff --git a/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml b/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
deleted file mode 100644
index 15046afb61..0000000000
--- a/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
-
-    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
-
-        <LinearLayout style="@style/LoginFormContainer">
-
-            <ImageView
-                style="@style/LoginLogo"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                android:id="@+id/loginWaitForEmailTitle"
-                style="@style/Widget.Vector.TextView.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_wait_for_email_title"
-                android:textColor="?vctr_content_primary" />
-
-            <TextView
-                android:id="@+id/loginWaitForEmailNotice"
-                style="@style/Widget.Vector.TextView.Subtitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:gravity="start"
-                android:textColor="?vctr_content_primary"
-                tools:text="@string/login_wait_for_email_notice_2" />
-
-            <TextView
-                android:id="@+id/loginWaitForEmailHelp"
-                style="@style/Widget.Vector.TextView.Body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:gravity="start"
-                android:text="@string/login_wait_for_email_help"
-                android:textColor="?vctr_content_secondary" />
-
-            <ProgressBar
-                style="@style/Widget.Vector.ProgressBar.Horizontal"
-                android:layout_width="240dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginTop="32dp"
-                android:indeterminate="true" />
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</FrameLayout>
-
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index f204276a7f..89ecf8a038 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -523,7 +523,9 @@
     <string name="auth_msisdn_already_defined">This phone number is already defined.</string>
     <string name="auth_forgot_password">Forgot password?</string>
     <string name="auth_recaptcha_message">This homeserver would like to make sure you are not a robot</string>
-    <string name="auth_reset_password_missing_email">The email address linked to your account must be entered.</string>
+
+    <!-- TODO delete  -->
+    <string name="auth_reset_password_missing_email" tools:ignore="UnusedResources">The email address linked to your account must be entered.</string>
     <string name="auth_reset_password_error_unauthorized">Failed to verify email address: make sure you clicked the link in the email</string>
     <string name="auth_reset_password_error_unverified">Email not verified, check your inbox</string>
     <string name="auth_accept_policies">"Please review and accept the policies of this homeserver:"</string>
diff --git a/vector/src/main/res/values/strings_login_v2.xml b/vector/src/main/res/values/strings_login_v2.xml
deleted file mode 100644
index c84455a665..0000000000
--- a/vector/src/main/res/values/strings_login_v2.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- Those strings are not final, so do not put them into Weblate for the moment -->
-
-    <string name="login_welcome_back">Welcome back %s!</string>
-    <string name="login_please_enter_your_password">Please enter your password</string>
-    <string name="login_please_enter_your_matrix_identifier">Please enter your Matrix identifier</string>
-    <string name="login_please_enter_your_matrix_identifier_help">Matrix identifiers start with @, for instance @alice:server.org</string>
-    <string name="login_enter_identifier_help">If you do not know your Matrix identifier, or if your account has been created using Single Sign On (for instance using a Google account), or if you want to connect using your simple name, or an email associated to your account, you have to select your server first.</string>
-    <string name="login_choose_a_server">Choose a server</string>
-    <string name="login_please_choose_a_server">Please choose a server</string>
-    <string name="login_please_select_your_server">Please select your server</string>
-    <string name="login_please_choose_a_password">Please choose a password</string>
-    <string name="login_please_choose_a_new_password">Please choose a new password</string>
-    <string name="login_your_matrix_identifier">Your Matrix identifier</string>
-    <string name="login_press_back_to_change">Press back to change</string>
-    <string name="login_choose_a_password">Choose a password</string>
-    <string name="login_enter_your_email">Enter an email associated to your Matrix account</string>
-    <string name="login_choose_a_new_password">Choose a new password</string>
-    <string name="login_please_choose_a_user_name">Please choose an identifier</string>
-    <string name="login_please_choose_a_user_name_help_2">Once your account is created, your identifier cannot be modified. However you will be able to change your display name.</string>
-    <string name="login_if_you_re_not_sure_select_this_option">If you\'re not sure, select this option</string>
-    <string name="login_element_matrix_server_and_others">Element Matrix Server and others</string>
-    <string name="login_create_a_new_account">Create a new account</string>
-    <string name="login_i_already_have_an_account">I already have an account</string>
-
-    <string name="login_unknown_user_warning">Warning: no profile information can be retrieved with this Matrix identifier. Please check that there is no mistake.</string>
-
-    <string name="login_wait_for_email_notice_2">We just sent an email to %1$s.</string>
-    <string name="login_wait_for_email_help">Click on the link it contains to continue the account creation.</string>
-    <string name="login_account_created_title">Congratulations!</string>
-    <string name="login_account_created_subtitle">You account %s has been successfully created.</string>
-    <string name="login_account_created_notice">To complete your profile, you can set a profile image and/or a display name. This can also be done later from the settings.</string>
-    <string name="login_account_created_notice_2">This is how your messages will appear:</string>
-    <string name="login_account_created_message">Hello Matrix world!</string>
-    <string name="login_account_created_instruction">Click on the image and on your name to configure them.</string>
-
-    <string name="login_set_email_title_2">Associate an email</string>
-    <string name="login_set_email_notice_2">Associate an email to be able to later recover your account, in case you forget your password.</string>
-    <string name="login_set_email_mandatory_notice_2">The server %s requires you to associate an email to create an account.</string>
-
-    <string name="login_set_msisdn_title_2">Associate a phone number</string>
-    <string name="login_set_msisdn_notice_2">Associate a phone number to optionally allow people you know to discover you.</string>
-    <string name="login_set_msisdn_mandatory_notice_2">The server %s requires you to associate a phone number to create an account.</string>
-    <!-- %S will be replaced by the value of login_server_modular_learn_more ("Learn more" in English)-->
-    <string name="login_server_modular_learn_more_about_ems">%s about Element Matrix Service.</string>
-
-</resources>
\ No newline at end of file