diff --git a/res/drawable/info_round.xml b/res/drawable/info_round.xml
deleted file mode 100644
index 668eaf3be..000000000
--- a/res/drawable/info_round.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="2dp" />
-            <solid android:color="#ff145c95" />
-        </shape>
-    </item>
-
-    <item>
-        <shape>
-            <corners android:radius="2dp" />
-            <solid android:color="#ff2090ea" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/res/layout/item_editable_contact.xml b/res/layout/item_editable_contact.xml
deleted file mode 100644
index 08bf496a0..000000000
--- a/res/layout/item_editable_contact.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout 
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical" 
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-    
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center_vertical">
-
-        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-            android:id="@+id/editable_contact_name"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="12dp"
-            android:layout_marginStart="12dp"
-            android:layout_weight="1"
-            android:textSize="20sp"
-            android:maxLines="2"
-            android:ellipsize="end"
-            tools:text="Peter Parker"/>
-
-        <ImageButton
-            android:id="@+id/editable_contact_name_edit_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="16dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:src="@drawable/ic_create_white_24dp"
-            android:tint="@color/signal_primary"/>
-
-    </LinearLayout>
-
-    <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:src="@color/grey_400"/>
-    
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/editable_contact_fields"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/item_selectable_contact_field.xml b/res/layout/item_selectable_contact_field.xml
deleted file mode 100644
index 8074933c2..000000000
--- a/res/layout/item_selectable_contact_field.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="5dp"
-    android:paddingBottom="5dp"
-    android:gravity="center_vertical">
-
-    <ImageView
-        android:id="@+id/contact_field_icon"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_margin="16dp"
-        android:tint="@color/grey_600"
-        tools:src="@drawable/ic_call_white_24dp" />
-
-    <ImageView
-        android:id="@+id/contact_field_avatar"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:visibility="gone"
-        tools:src="@drawable/ic_contact_picture" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical">
-
-        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-            android:id="@+id/contact_field_value"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:maxLines="1"
-            android:ellipsize="end"
-            tools:text="(610) 867-5309" />
-
-        <TextView
-            android:id="@+id/contact_field_label"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:maxLines="1"
-            android:ellipsize="end"
-            tools:text="Mobile"/>
-
-    </LinearLayout>
-
-    <CheckBox
-        android:id="@+id/contact_field_checkbox"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="16dp"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/menu/log_submit.xml b/res/menu/log_submit.xml
deleted file mode 100644
index abd321d48..000000000
--- a/res/menu/log_submit.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:title="@string/preferences__submit_debug_log"
-          android:id="@+id/menu_submit_debug_logs"
-          android:icon="@android:drawable/ic_menu_upload" />
-</menu>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3a2cd9c98..5c716a908 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -153,10 +153,6 @@
         <item name="android:textSize">12sp</item>
     </style>
 
-    <style name="InfoButton" parent="@style/MaterialButton">
-        <item name="android:background">@drawable/info_round</item>
-    </style>
-
     <style name="ComposeEditText" parent="@style/Signal.Text.Body">
         <item name="android:padding">2dp</item>
         <item name="android:background">@null</item>