diff --git a/OpenKeychain/src/main/res/layout/passphrase_wizard.xml b/OpenKeychain/src/main/res/layout/passphrase_wizard.xml
deleted file mode 100644
index efc65b7c7..000000000
--- a/OpenKeychain/src/main/res/layout/passphrase_wizard.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <FrameLayout
-        android:id="@+id/fragmentContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_nfc.xml b/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_nfc.xml
deleted file mode 100644
index 46d430c4e..000000000
--- a/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_nfc.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="16dp">
-
-    <TextView
-        android:id="@+id/nfcText"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="8dp"
-        android:text="@string/nfc_text"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:lines="2" />
-
-
-    <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/imageView"
-        android:padding="16dp"
-        android:layout_gravity="center"
-        android:layout_weight="1"
-        android:src="@drawable/nfc"
-        android:adjustViewBounds="true" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_passphrase.xml b/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_passphrase.xml
deleted file mode 100644
index de957cc74..000000000
--- a/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_passphrase.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<LinearLayout 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:padding="16dp"
-    android:orientation="vertical"
-    tools:context="pSontag.testopenkeychain.Passphrase">
-
-
-    <TableLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <TableRow android:layout_marginBottom="10dp">
-
-            <TextView
-                android:id="@+id/passphraseText"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_span="2"
-                android:padding="8dp"
-                android:layout_gravity="center_vertical"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="@string/passphrase"
-                android:layout_weight="1" />
-        </TableRow>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <TableRow>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:layout_weight="1"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="@string/passphrase" />
-
-            <EditText
-                android:id="@+id/passphrase"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:inputType="textPassword"
-                android:padding="8dp"
-                android:layout_weight="6" />
-
-        </TableRow>
-
-        <TableRow
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp">
-
-            <TextView
-                android:id="@+id/passphraseTextAgain"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:text="@string/passphrase_again"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_weight="1" />
-
-            <EditText
-                android:id="@+id/passphraseAgain"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:inputType="textPassword"
-                android:imeOptions="actionDone"
-                android:padding="8dp"
-                android:layout_weight="6" />
-
-        </TableRow>
-    </TableLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dip"
-        android:background="?android:attr/listDivider" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <!--<Button-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:text="Cancel"-->
-            <!--android:onClick="cancel"-->
-            <!--android:layout_weight="1"-->
-            <!--android:textAppearance="?android:attr/textAppearanceMedium"-->
-            <!--style="?attr/alp_42447968_button_bar_button_style" />-->
-
-        <!--<View-->
-            <!--android:layout_width="1dip"-->
-            <!--android:layout_height="50dip"-->
-            <!--android:background="?android:attr/listDivider" />-->
-
-        <!--<Button-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:text="Ok"-->
-            <!--android:onClick="savePassphrase"-->
-            <!--android:layout_weight="1"-->
-            <!--android:textAppearance="?android:attr/textAppearanceMedium"-->
-            <!--style="?attr/alp_42447968_button_bar_button_style" />-->
-
-    </LinearLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dip"
-        android:background="?android:attr/listDivider" />
-</LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_select_methods.xml b/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_select_methods.xml
deleted file mode 100644
index d509fbeec..000000000
--- a/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_select_methods.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<ScrollView 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:padding="16dp"
-    tools:context="pSontag.testopenkeychain.SelectMethods">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="10dp"
-            android:padding="8dp"
-            android:text="@string/title_unlock_method"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <TextView
-            android:id="@+id/selectNoPassphrase"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:text="@string/noPassphrase"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:padding="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:clickable="true"
-            android:onClick="noPassphrase"
-            android:background="?android:selectableItemBackground"/>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <TextView
-            android:id="@+id/selectPassphrase"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:text="@string/passphrase"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:padding="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:clickable="true"
-            android:onClick="passphrase"
-            android:background="?android:selectableItemBackground"/>
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-        <TextView
-            android:id="@+id/selectLockpattern"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:text="@string/lockpattern"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:padding="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:clickable="true"
-            android:onClick="startLockpattern"
-            android:background="?android:selectableItemBackground"/>
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-        <TextView
-            android:id="@+id/selectLockpatternNFC"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:text="@string/lockpatternNFC"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:padding="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:clickable="true"
-            android:onClick="NFC"
-            android:background="?android:selectableItemBackground"/>
-
-    </LinearLayout>
-</ScrollView>