diff --git a/build.gradle b/build.gradle
index 28c6ab9c6..dc6d16cec 100644
--- a/build.gradle
+++ b/build.gradle
@@ -78,7 +78,6 @@ dependencies {
         exclude group: 'com.squareup.okhttp3', module: 'okhttp'
     }
     compile 'org.whispersystems:signal-service-android:2.7.6'
-    compile 'org.whispersystems:webrtc-android:M68'
 
     compile 'com.journeyapps:zxing-android-embedded:3.4.0'
 
@@ -165,7 +164,6 @@ dependencyVerification {
         'com.google.android.exoplayer:exoplayer:955085aa611a8f7cf6c61b88ae03d1a392f4ad94c9bfbc153f3dedb9ffb14718',
         'org.whispersystems:libpastelog:fe56b4db9ec743c8b565e3e4caa9228fafe132dc0bf82000d6e359b97a81177c',
         'org.whispersystems:signal-service-android:823eed29e64fb0aa30d2078cb5ec0245e2a0713a4028121329c5c28788ef27f8',
-        'org.whispersystems:webrtc-android:66cb312eb024eaf6aa93e662d37d0c46632e049d47a2dcc9c291207589ee7a43',
         'me.leolin:ShortcutBadger:e3cb3e7625892129b0c92dd5e4bc649faffdd526d5af26d9c45ee31ff8851774',
         'se.emilsjolander:stickylistheaders:a08ca948aa6b220f09d82f16bbbac395f6b78897e9eeac6a9f0b0ba755928eeb',
         'com.jpardogo.materialtabstrip:library:c6ef812fba4f74be7dc4a905faa4c2908cba261a94c13d4f96d5e67e4aad4aaa',
@@ -295,7 +293,6 @@ android {
                           'proguard-glide.pro',
                           'proguard-shortcutbadger.pro',
                           'proguard-retrofit.pro',
-                          'proguard-webrtc.pro',
                           'proguard-klinker.pro',
                           'proguard-retrolambda.pro',
                           'proguard-okhttp.pro',
diff --git a/proguard-webrtc.pro b/proguard-webrtc.pro
deleted file mode 100644
index 7a1e3dea5..000000000
--- a/proguard-webrtc.pro
+++ /dev/null
@@ -1,3 +0,0 @@
--dontwarn org.webrtc.NetworkMonitorAutoDetect
--dontwarn android.net.Network
--keep class org.webrtc.** { *; }
diff --git a/res/layout/create_passphrase_activity.xml b/res/layout/create_passphrase_activity.xml
deleted file mode 100644
index fbffc4842..000000000
--- a/res/layout/create_passphrase_activity.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:id="@+id/prompt_layout"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@color/signal_primary">
-
-
-  <ProgressBar android:id="@+id/passphrase_edit"
-               android:layout_width="75dp"
-               android:layout_height="75dp"
-               android:indeterminate="true"
-               android:padding="10dp"
-               android:layout_centerInParent="true"
-               style="?android:attr/progressBarStyleLargeInverse"/>
-
-  <ImageView android:id="@+id/watermark"
-             android:layout_width="wrap_content"
-             android:layout_height="wrap_content"
-             android:layout_centerHorizontal="true"
-             android:layout_marginBottom="20dp"
-             android:layout_above="@id/passphrase_edit"
-             android:src="@drawable/icon_transparent"
-             android:contentDescription="@string/PassphrasePromptActivity_watermark_content_description"/>
-
-</RelativeLayout>
diff --git a/res/layout/database_migration_activity.xml b/res/layout/database_migration_activity.xml
deleted file mode 100644
index 87bc8ebe0..000000000
--- a/res/layout/database_migration_activity.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:fillViewport="true"
-            android:background="@drawable/background_pattern_repeat">
-
-    <FrameLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:gravity="center" >
-        
-        <LinearLayout android:id="@+id/prompt_layout"
-                      android:paddingRight="16dip"
-                      android:paddingLeft="16dip"
-                      android:paddingTop="10dip"
-                      android:layout_width="fill_parent"
-                      android:layout_height="wrap_content"
-                      android:layout_gravity="center"
-                      android:visibility="gone"
-                      android:orientation="vertical">
-    
-            <TextView style="@style/Registration.Description"
-                      android:layout_width="fill_parent"
-                      android:layout_marginBottom="16dip"
-                      android:text="@string/database_migration_activity__would_you_like_to_import_your_existing_text_messages"/>
-            
-            <ImageView android:layout_width="wrap_content"
-                       android:layout_height="wrap_content"
-                       android:layout_gravity="center"
-                       android:src="@drawable/import_database"/>
-        
-            <TextView style="@style/Registration.Description"
-                      android:layout_width="fill_parent"
-                      android:layout_marginBottom="16dip"
-                      android:layout_marginTop="16dip"
-                      android:text="@string/database_migration_activity__the_default_system_database_will_not_be_modified"/>
-            
-            <LinearLayout android:orientation="horizontal"
-                          android:gravity="center"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content"
-                          android:layout_marginTop="20dip">
-
-                <Button android:id="@+id/skip_button"
-                        android:text="@string/database_migration_activity__skip"
-                        android:layout_weight="1"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginRight="7dip"
-                        android:textAppearance="?android:attr/textAppearanceMedium"/>
-                
-                <Button android:id="@+id/import_button"
-                        android:text="@string/database_migration_activity__import"
-                        android:layout_weight="1"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:textAppearance="?android:attr/textAppearanceMedium"/>                
-            </LinearLayout>
-        </LinearLayout>
-        
-        <LinearLayout android:id="@+id/progress_layout"
-                      android:paddingRight="16dip"
-                      android:paddingLeft="16dip"
-                      android:paddingTop="10dip"
-                      android:layout_width="fill_parent"
-                      android:layout_height="wrap_content"
-                      android:layout_gravity="center"
-                      android:visibility="visible"
-                      android:orientation="vertical">
-    
-            <ImageView android:layout_width="wrap_content"
-                       android:layout_height="wrap_content"
-                       android:layout_gravity="center"
-                       android:src="@drawable/import_database"/>
-            
-            
-            <TextView style="@style/Registration.Description"
-                      android:layout_width="fill_parent"
-                      android:layout_marginTop="34dip"
-                      android:layout_marginBottom="16dip"
-                      android:text="@string/database_migration_activity__this_could_take_a_moment_please_be_patient"/>
-            
-            <RelativeLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="15dip"
-                android:layout_weight="1.0" >
-
-                <TextView
-                    android:id="@+id/import_status"
-                    style="@style/Registration.Constant"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:text="0/100"
-                    android:textSize="12.0sp" />
-
-                <TextView
-                    style="@style/Registration.Constant"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:text="@string/database_migration_activity__importing"
-                    android:textAllCaps="true"
-                    android:textSize="12.0sp"
-                    android:textStyle="normal" />
-            </RelativeLayout>
-
-            <ProgressBar
-                android:id="@+id/import_progress"
-                style="@style/Widget.ProgressBar.Horizontal"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="14.0dip"
-                android:layout_marginTop="2.0dip" />
-            
-        </LinearLayout>        
-    </FrameLayout>
-</ScrollView>
diff --git a/res/layout/database_upgrade_activity.xml b/res/layout/database_upgrade_activity.xml
deleted file mode 100644
index 8f797c9b2..000000000
--- a/res/layout/database_upgrade_activity.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:fillViewport="true"
-            android:background="@drawable/background_pattern_repeat">
-
-    <FrameLayout
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:gravity="center" >
-
-        <LinearLayout android:paddingRight="16dip"
-                      android:paddingLeft="16dip"
-                      android:paddingTop="10dip"
-                      android:layout_width="fill_parent"
-                      android:layout_height="wrap_content"
-                      android:layout_gravity="center"
-                      android:visibility="visible"
-                      android:orientation="vertical">
-
-                <TextView style="@style/Registration.BigLabel"
-                          android:layout_width="fill_parent"
-                          android:layout_marginBottom="16dip"
-                          android:layout_marginTop="16dip"
-                          android:gravity="center"
-                          android:text="@string/database_upgrade_activity__updating_database"/>
-
-                <ProgressBar android:id="@+id/indeterminate_progress"
-                             android:layout_width="wrap_content"
-                             android:layout_height="wrap_content"
-                             android:indeterminate="true"
-                             android:layout_gravity="center"/>
-
-            <ProgressBar android:id="@+id/determinate_progress"
-                         style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-                         android:layout_width="fill_parent"
-                         android:layout_height="wrap_content"
-                         android:indeterminate="false"
-                         android:visibility="gone"
-                         android:layout_gravity="center"/>
-
-        </LinearLayout>
-    </FrameLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/res/layout/enter_backup_passphrase_dialog.xml b/res/layout/enter_backup_passphrase_dialog.xml
deleted file mode 100644
index 0ace5eb07..000000000
--- a/res/layout/enter_backup_passphrase_dialog.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="wrap_content"
-             android:padding="16dp">
-
-    <android.support.design.widget.TextInputLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-        <android.support.design.widget.TextInputEditText
-                android:id="@+id/restore_passphrase_input"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/enter_backup_passphrase_dialog__backup_passphrase"
-                android:imeOptions="actionDone"
-                android:inputType="number" />
-
-    </android.support.design.widget.TextInputLayout>
-</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/experience_upgrade_activity.xml b/res/layout/experience_upgrade_activity.xml
deleted file mode 100644
index 684572165..000000000
--- a/res/layout/experience_upgrade_activity.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             xmlns:fab="http://schemas.android.com/apk/res-auto"
-             android:id="@+id/container"
-             android:orientation="vertical"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent">
-
-    <android.support.v4.view.ViewPager
-        android:id="@+id/pager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <Button android:id="@+id/continue_button"
-            android:layout_width="140sp"
-            android:layout_height="wrap_content"
-            android:text="@string/experience_upgrade_activity__continue"
-            android:visibility="invisible"
-            android:layout_alignParentBottom="true"
-            android:layout_centerHorizontal="true" />
-
-    <com.melnykov.fab.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|right"
-        android:layout_margin="25dp"
-        android:src="@drawable/ic_arrow_forward_white_24dp"
-        android:focusable="true"
-        android:contentDescription="@string/conversation_list_fragment__fab_content_description"
-        fab:fab_shadow="false"
-        fab:fab_colorNormal="#33000000"
-        fab:fab_colorPressed="#66000000"
-        fab:fab_colorRipple="#66000000" />
-</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/experience_upgrade_preference_fragment.xml b/res/layout/experience_upgrade_preference_fragment.xml
deleted file mode 100644
index 28669bd0f..000000000
--- a/res/layout/experience_upgrade_preference_fragment.xml
+++ /dev/null
@@ -1,66 +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"
-              xmlns:app="http://schemas.android.com/apk/res-auto"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              tools:background="#FF2090ea">
-
-        <TextView android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:textAppearance="?android:attr/textAppearanceMedium"
-                  android:id="@+id/blurb"
-                  android:textSize="@dimen/onboarding_title_size"
-                  android:textIsSelectable="false"
-                  android:gravity="center_horizontal"
-                  android:paddingLeft="20dp"
-                  android:paddingRight="20dp"
-                  android:fontFamily="sans-serif-light"
-                  android:text="@string/experience_upgrade_preference_fragment__read_receipts_are_here"
-                  android:layout_marginTop="20dp"
-                  android:textColor="@android:color/white" />
-
-        <FrameLayout android:layout_width="wrap_content"
-                     android:layout_height="wrap_content"
-                     android:layout_gravity="center"
-                     android:layout_marginBottom="20dp"
-                     android:layout_marginTop="20dp">
-
-            <ImageView android:layout_width="170dp"
-                       android:layout_height="170dp"
-                       android:src="@drawable/circle_tintable"
-                       android:scaleType="fitCenter"/>
-
-            <ImageView android:layout_width="100dp"
-                       android:layout_height="100dp"
-                       android:layout_gravity="center"
-                       app:srcCompat="@drawable/read_receipt_vector"/>
-        </FrameLayout>
-
-        <TextView android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:id="@+id/subblurb"
-                  android:textSize="@dimen/onboarding_subtitle_size"
-                  android:textIsSelectable="false"
-                  android:gravity="center_horizontal"
-                  android:paddingLeft="20dp"
-                  android:paddingRight="20dp"
-                  android:fontFamily="sans-serif-light"
-                  android:text="@string/experience_upgrade_preference_fragment__optionally_see_and_share_when_messages_have_been_read"
-                  android:textColor="@android:color/white" />
-
-            <android.support.v7.widget.SwitchCompat
-                    android:id="@+id/preference"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="20dp"
-                    android:enabled="true"
-                    android:checked="true"
-                    android:text="@string/experience_upgrade_preference_fragment__enable_read_receipts"
-                    android:textSize="20sp"
-                    android:textColor="@android:color/white"
-                    app:theme="@style/Color1SwitchStyle"/>
-
-</LinearLayout>
diff --git a/res/layout/key_caching_notification.xml b/res/layout/key_caching_notification.xml
deleted file mode 100644
index f5d62019d..000000000
--- a/res/layout/key_caching_notification.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-
-    <LinearLayout android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:layout_alignParentLeft="true"
-                  android:layout_centerVertical="true"
-                  android:orientation="vertical"
-                  android:layout_marginLeft="10dip">
-	<TextView android:id="@+id/title"
-        android:textAppearance="@style/NotificationTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:fadingEdge="horizontal"
-        android:text="@string/KeyCachingService_passphrase_cached"
-        />
-
-   <TextView android:id="@+id/text2"
-        android:textAppearance="@style/NotificationText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="-2dp"
-        android:layout_marginBottom="-2dp"
-        android:singleLine="true"
-        android:fadingEdge="horizontal"
-        android:ellipsize="marquee"
-        android:text="@string/KeyCachingService_signal_passphrase_cached_with_lock"
-        />
-    </LinearLayout>
-    
-	<ImageView android:id="@+id/lock_cache_icon"
-        android:src="@drawable/icon_lock"
-        android:layout_width="64dp"
-        android:layout_height="64dp"
-        android:background="@drawable/notify_panel_notification_icon_bg_tile"
-        android:scaleType="center" 
-        android:layout_alignParentRight="true"
-        />
-	    
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/prompt_passphrase_activity.xml b/res/layout/prompt_passphrase_activity.xml
deleted file mode 100644
index ca8b673ac..000000000
--- a/res/layout/prompt_passphrase_activity.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
-                android:id="@+id/prompt_layout"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
-
-    <View android:id="@+id/shim"
-          android:layout_width="match_parent"
-          android:layout_height="1dp"
-          android:layout_centerVertical="true"
-          android:visibility="invisible"/>
-
-    <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?login_top_background"
-            android:layout_above="@id/shim">
-
-    </FrameLayout>
-
-    <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:layout_marginTop="20dp">
-
-        <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/icon_transparent"
-                android:layout_gravity="center"/>
-
-    </android.support.v7.widget.Toolbar>
-
-
-    <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="30dp"
-            android:layout_marginRight="30dp"
-            android:orientation="vertical"
-            android:background="?login_floating_background"
-            android:layout_centerInParent="true"
-            android:padding="20dp"
-            android:elevation="10dp">
-
-        <TextView android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:layout_marginBottom="40dp"
-                  android:text="@string/prompt_passphrase_activity__signal_is_locked"
-                  android:gravity="center_horizontal"
-                  android:textSize="25sp"/>
-
-        <ImageView android:id="@+id/fingerprint_auth_container"
-                android:src="@drawable/ic_fingerprint_white_48dp"
-                android:background="@drawable/circle_tintable"
-                android:backgroundTint="@color/signal_primary"
-                android:padding="20dp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginBottom="60dp"
-                tools:visibility="visible"/>
-
-        <TextView android:id="@+id/lock_screen_auth_container"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:background="@drawable/rounded_rectangle_dark"
-                  android:backgroundTint="@color/signal_primary"
-                  android:textColor="@color/white"
-                  android:gravity="center_horizontal"
-                  android:elevation="3dp"
-                  android:padding="10dp"
-                  android:text="@string/prompt_passphrase_activity__tap_to_unlock"
-                  tools:visibility="gone"/>
-
-        <RelativeLayout android:id="@+id/password_auth_container"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="60dp"
-                        tools:visibility="gone">
-
-            <EditText android:id="@+id/passphrase_edit"
-                      android:layout_width="match_parent"
-                      android:layout_height="45sp"
-                      android:inputType="textPassword"
-                      android:layout_marginLeft="50dp"
-                      android:layout_marginRight="50dp"
-                      android:singleLine="true"
-                      android:paddingLeft="10dp"
-                      android:paddingRight="40dp"/>
-
-            <org.thoughtcrime.securesms.components.AnimatingToggle
-                    android:id="@+id/button_toggle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignRight="@+id/passphrase_edit"
-                    android:layout_centerVertical="true"
-                    android:layout_gravity="center"
-                    android:gravity="center">
-
-                <ImageButton android:id="@+id/passphrase_visibility"
-                             android:src="?ic_visibility"
-                             android:background="@drawable/touch_highlight_background"
-                             android:layout_width="wrap_content"
-                             android:layout_height="wrap_content"
-                             android:paddingLeft="8dp"
-                             android:paddingRight="8dp"
-                             android:paddingTop="3dp"
-                             android:paddingBottom="3dp"
-                             android:layout_centerVertical="true" />
-
-                <ImageButton android:id="@+id/passphrase_visibility_off"
-                             android:src="?ic_visibility_off"
-                             android:background="@drawable/touch_highlight_background"
-                             android:layout_width="wrap_content"
-                             android:layout_height="wrap_content"
-                             android:paddingLeft="8dp"
-                             android:paddingRight="8dp"
-                             android:paddingTop="3dp"
-                             android:paddingBottom="3dp"
-                             android:layout_centerVertical="true" />
-
-            </org.thoughtcrime.securesms.components.AnimatingToggle>
-
-            <ImageButton android:id="@+id/ok_button"
-                         android:src="?ic_arrow_forward"
-                         android:contentDescription="@string/PassphrasePromptActivity_ok_button_content_description"
-                         android:background="@null"
-                         android:text="@string/prompt_passphrase_activity__unlock"
-                         android:layout_width="wrap_content"
-                         android:layout_height="wrap_content"
-                         android:layout_alignParentRight="true"
-                         android:layout_centerVertical="true"
-                         android:textAppearance="?android:attr/textAppearanceMedium"
-                         android:paddingLeft="5dp"
-                         android:paddingTop="5dp"
-                         android:paddingRight="10dp"
-                         android:paddingBottom="5dp"/>
-        </RelativeLayout>
-
-    </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/registration_call_me_view.xml b/res/layout/registration_call_me_view.xml
deleted file mode 100644
index a31bb286f..000000000
--- a/res/layout/registration_call_me_view.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:tools="http://schemas.android.com/tools"
-       tools:parentTag="android.widget.RelativeLayout">
-
-    <ImageView android:id="@+id/phone_icon"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:layout_alignParentStart="true"
-               android:layout_alignParentLeft="true"
-               android:layout_centerVertical="true"
-               android:src="@drawable/ic_phone_grey600_32dp"/>
-
-    <TextView android:id="@+id/call_me_text"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_toRightOf="@id/phone_icon"
-              android:layout_toEndOf="@id/phone_icon"
-              android:layout_centerVertical="true"
-              android:layout_marginStart="10dp"
-              android:layout_marginLeft="10dp"
-              android:gravity="center_vertical"
-              android:textSize="16sp"
-              android:text="@string/RegistrationActivity_call_me_instead"/>
-
-    <TextView android:id="@+id/available_in_text"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_toLeftOf="@+id/countdown"
-              android:layout_toStartOf="@+id/countdown"
-              android:layout_centerVertical="true"
-              android:gravity="center_vertical"
-              android:textSize="16sp"
-              android:text="@string/RegistrationActivity_available_in"/>
-
-    <TextView android:id="@+id/countdown"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_alignParentEnd="true"
-              android:layout_alignParentRight="true"
-              android:layout_centerVertical="true"
-              android:textSize="16sp"
-              tools:text="1:04"/>
-
-</merge>
\ No newline at end of file
diff --git a/res/layout/registration_lock_dialog_view.xml b/res/layout/registration_lock_dialog_view.xml
deleted file mode 100644
index eb93f6642..000000000
--- a/res/layout/registration_lock_dialog_view.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="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:paddingTop="16dp"
-              android:paddingLeft="23dp"
-              android:paddingRight="23dp"
-              android:animateLayoutChanges="true">
-
-    <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:text="@string/registration_lock_dialog_view__the_pin_can_consist_of_four_or_more_digits_if_you_forget_your_pin_you_could_be_locked_out_of_your_account_for_up_to_seven_days"/>
-
-    <android.support.design.widget.TextInputLayout
-            android:layout_marginTop="15dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-        <android.support.design.widget.TextInputEditText
-                android:id="@+id/pin"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:inputType="numberPassword"
-                android:imeOptions="actionNext"
-                android:hint="@string/registration_lock_dialog_view__enter_pin"/>
-
-    </android.support.design.widget.TextInputLayout>
-
-
-    <android.support.design.widget.TextInputLayout
-            android:layout_marginTop="15dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-        <android.support.design.widget.TextInputEditText
-                android:id="@+id/repeat"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:inputType="numberPassword"
-                android:imeOptions="actionDone"
-                android:hint="@string/registration_lock_dialog_view__confirm_pin"/>
-
-    </android.support.design.widget.TextInputLayout>
-
-
-    <ProgressBar android:id="@+id/progress"
-                 android:layout_width="match_parent"
-                 android:layout_height="wrap_content"
-                 android:layout_marginTop="10dp"
-                 android:visibility="gone"
-                 tools:visibility="visible"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/registration_lock_reminder_view.xml b/res/layout/registration_lock_reminder_view.xml
deleted file mode 100644
index 9006a95ea..000000000
--- a/res/layout/registration_lock_reminder_view.xml
+++ /dev/null
@@ -1,53 +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="wrap_content"
-              android:layout_height="wrap_content">
-
-    <LinearLayout android:id="@+id/header_container"
-                  android:background="@color/signal_primary"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="horizontal"
-                  android:gravity="center"
-                  android:padding="40dp">
-
-        <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/white"
-                android:textSize="18sp"
-                android:gravity="center_horizontal"
-                android:text="@string/registration_lock_reminder_view__enter_your_registration_lock_pin"/>
-
-    </LinearLayout>
-
-    <android.support.design.widget.TextInputLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="40dp"
-            android:paddingLeft="80dp"
-            android:paddingRight="80dp">
-
-        <android.support.design.widget.TextInputEditText
-                android:id="@+id/pin"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:inputType="numberPassword"
-                android:hint="@string/registration_lock_reminder_view__enter_pin"/>
-
-    </android.support.design.widget.TextInputLayout>
-
-    <TextView android:id="@+id/reminder"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:paddingTop="40dp"
-              android:paddingBottom="40dp"
-              android:paddingLeft="20dp"
-              android:paddingRight="20dp"
-              android:textSize="15sp"
-              android:lineSpacingMultiplier="1.3"
-              tools:text="Reminder: Registration Lock is enabled for your phone number. To help you memorize your Registration Lock PIN, Signal will periodically ask you to confirm it. I forgot my PIN."/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/registration_unlock_dialog_view.xml b/res/layout/registration_unlock_dialog_view.xml
deleted file mode 100644
index f261f63d1..000000000
--- a/res/layout/registration_unlock_dialog_view.xml
+++ /dev/null
@@ -1,16 +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="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_gravity="center_horizontal"
-              android:animateLayoutChanges="true">
-
-    <ProgressBar android:id="@+id/progress"
-                 android:layout_width="match_parent"
-                 android:layout_height="match_parent"
-                 android:visibility="gone"
-                 tools:visibility="visible"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/unknown_sender_view.xml b/res/layout/unknown_sender_view.xml
deleted file mode 100644
index 9756e5a2a..000000000
--- a/res/layout/unknown_sender_view.xml
+++ /dev/null
@@ -1,95 +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="wrap_content"
-              android:paddingLeft="16dp"
-              android:paddingRight="16dp"
-              android:layout_marginTop="20dp"
-              android:background="@color/white">
-
-    <TextView android:id="@+id/unknown_sender_label"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:layout_marginTop="10dp"
-              android:layout_marginBottom="25dp"
-              android:textColor="?android:textColorSecondary"
-              android:text="@string/unknown_sender_view__the_sender_is_not_in_your_contact_list"/>
-
-
-    <LinearLayout android:id="@+id/block"
-                  android:orientation="horizontal"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:layout_marginBottom="25dp"
-                  android:clickable="true"
-                  android:gravity="center_vertical">
-
-        <ImageView android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:src="@drawable/ic_block_white_24dp"
-                   android:tint="@color/signal_primary"/>
-
-        <TextView android:layout_marginLeft="15dp"
-                  android:layout_marginStart="15dp"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:text="@string/unknown_sender_view__block"
-                  android:textAllCaps="true"
-                  android:textStyle="bold"
-                  android:textColor="@color/signal_primary"
-                  android:textSize="14sp"/>
-
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/add_to_contacts"
-                  android:clickable="true"
-                  android:orientation="horizontal"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:layout_marginBottom="25dp"
-                  android:gravity="center_vertical">
-
-        <ImageView android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:src="@drawable/ic_person_add_white_24dp"
-                   android:tint="@color/signal_primary"/>
-
-        <TextView android:layout_marginLeft="15dp"
-                  android:layout_marginStart="15dp"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:text="@string/unknown_sender_view__add_to_contacts"
-                  android:textAllCaps="true"
-                  android:textStyle="bold"
-                  android:textColor="@color/signal_primary"
-                  android:textSize="14sp"/>
-
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/share_profile"
-                  android:clickable="true"
-                  android:orientation="horizontal"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:layout_marginBottom="25dp"
-                  android:gravity="center_vertical">
-
-        <ImageView android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:src="@drawable/ic_face_white_24dp"
-                   android:tint="@color/signal_primary"/>
-
-        <TextView android:layout_marginLeft="15dp"
-                  android:layout_marginStart="15dp"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:text="@string/unknown_sender_view__don_t_add_but_make_my_profile_visible"
-                  android:textAllCaps="true"
-                  android:textStyle="bold"
-                  android:textColor="@color/signal_primary"
-                  android:textSize="14sp"/>
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/unverified_banner_view.xml b/res/layout/unverified_banner_view.xml
deleted file mode 100644
index 846f821c6..000000000
--- a/res/layout/unverified_banner_view.xml
+++ /dev/null
@@ -1,42 +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:id="@+id/container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/reminder_background_normal"
-        android:focusable="true"
-        android:nextFocusRight="@+id/cancel"
-        android:orientation="horizontal"
-        tools:visibility="visible">
-
-    <ImageView android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:layout_marginLeft="16dp"
-
-               android:layout_gravity="center_vertical"
-               android:src="@drawable/ic_alert"/>
-
-    <TextView android:id="@+id/unverified_text"
-              android:layout_width="0dp"
-              android:layout_height="wrap_content"
-              android:textColor="@color/white"
-              android:textSize="16sp"
-              android:layout_weight="1"
-              android:layout_margin="16dp"
-              tools:text="Your safety number with Jules Bonnot has changed and is no longer verified"/>
-
-    <ImageButton
-            android:id="@+id/cancel"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:layout_marginTop="2dp"
-            android:background="?selectableItemBackgroundBorderless"
-            android:focusable="true"
-            android:nextFocusLeft="@+id/container"
-            android:nextFocusRight="@+id/container"
-            android:src="@drawable/ic_close_white_24dp"
-            android:contentDescription="@string/InviteActivity_cancel"/>
-
-</LinearLayout>
diff --git a/res/layout/verification_code_view.xml b/res/layout/verification_code_view.xml
deleted file mode 100644
index 4c395cfed..000000000
--- a/res/layout/verification_code_view.xml
+++ /dev/null
@@ -1,154 +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:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_gravity="center">
-
-    <LinearLayout android:id="@+id/container_zero"
-                  android:orientation="vertical"
-                  android:gravity="center_horizontal"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content">
-
-        <TextView android:id="@+id/code_zero"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:textSize="30sp"
-                  android:textStyle="bold"
-                  tools:text="1"/>
-
-        <View android:id="@+id/space_zero"
-              android:layout_width="20dp"
-              android:layout_height="1dp"
-              android:background="@color/black"/>
-
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/container_one"
-                  android:orientation="vertical"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:gravity="center_horizontal"
-                  android:layout_marginLeft="5dp">
-
-        <TextView android:id="@+id/code_one"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:textSize="30sp"
-                  android:textStyle="bold"
-                  tools:text="2"/>
-
-        <View android:id="@+id/space_one"
-              android:layout_width="20dp"
-              android:layout_height="1dp"
-              android:background="@color/black"/>
-
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/container_two"
-                  android:orientation="vertical"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:gravity="center_horizontal"
-                  android:layout_marginLeft="5dp">
-
-        <TextView android:id="@+id/code_two"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:textSize="30sp"
-                  android:textStyle="bold"
-                  tools:text="2"/>
-
-        <View android:id="@+id/space_two"
-              android:layout_width="20dp"
-              android:layout_height="1dp"
-              android:background="@color/black"/>
-
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/separator_container"
-                  android:orientation="vertical"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:gravity="center_horizontal"
-                  android:layout_marginLeft="5dp">
-
-        <TextView android:id="@+id/separator"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:textSize="30sp"
-                  android:textStyle="bold"
-                  android:text="-"/>
-
-        <View
-              android:layout_width="20dp"
-              android:layout_height="1dp"/>
-
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/container_three"
-                  android:orientation="vertical"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:gravity="center_horizontal"
-                  android:layout_marginLeft="5dp">
-
-        <TextView android:id="@+id/code_three"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:textSize="30sp"
-                  android:textStyle="bold"
-                  tools:text="2"/>
-
-        <View android:id="@+id/space_three"
-              android:layout_width="20dp"
-              android:layout_height="1dp"
-              android:background="@color/black"/>
-
-    </LinearLayout>
-
-
-    <LinearLayout android:id="@+id/container_four"
-                  android:orientation="vertical"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:gravity="center_horizontal"
-                  android:layout_marginLeft="5dp">
-
-        <TextView android:id="@+id/code_four"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:textSize="30sp"
-                  android:textStyle="bold"
-                  tools:text="2"/>
-
-        <View android:id="@+id/space_four"
-              android:layout_width="20dp"
-              android:layout_height="1dp"
-              android:background="@color/black"/>
-
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/container_five"
-                  android:orientation="vertical"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:gravity="center_horizontal"
-                  android:layout_marginLeft="5dp">
-
-        <TextView android:id="@+id/code_five"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:textSize="30sp"
-                  android:textStyle="bold"
-                  tools:text="2"/>
-
-        <View android:id="@+id/space_five"
-              android:layout_width="20dp"
-              android:layout_height="1dp"
-              android:background="@color/black"/>
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/verification_pin_keyboard_view.xml b/res/layout/verification_pin_keyboard_view.xml
deleted file mode 100644
index c02ef3447..000000000
--- a/res/layout/verification_pin_keyboard_view.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:tools="http://schemas.android.com/tools">
-
-    <android.inputmethodservice.KeyboardView
-            android:id="@+id/keyboard_view"
-            android:keyBackground="@color/grey_300"
-            android:background="@color/grey_300"
-            android:keyTextColor="@color/black"
-            android:shadowColor="@color/transparent"
-            android:keyTextSize="30sp"
-            android:elevation="3dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
-
-    <ProgressBar android:id="@+id/progress"
-                 android:layout_gravity="center"
-                 android:layout_width="96dp"
-                 android:layout_height="96dp"
-                 android:indeterminate="true"/>
-
-    <org.thoughtcrime.securesms.components.SquareImageView
-            android:id="@+id/success"
-            android:layout_width="96dp"
-            android:layout_height="96dp"
-            android:layout_gravity="center"
-            android:background="@drawable/circle_tintable"
-            android:backgroundTint="@color/green_400"
-            android:gravity="center_vertical"
-            android:src="@drawable/ic_check_white_48dp"/>
-
-    <org.thoughtcrime.securesms.components.SquareImageView
-            android:id="@+id/failure"
-            android:layout_width="96dp"
-            android:layout_height="96dp"
-            android:layout_gravity="center"
-            android:background="@drawable/circle_tintable"
-            android:backgroundTint="@color/green_400"
-            android:gravity="center_vertical"
-            android:src="@drawable/ic_close_white_48dp"/>
-
-    <org.thoughtcrime.securesms.components.SquareImageView
-            android:id="@+id/locked"
-            android:layout_width="96dp"
-            android:layout_height="96dp"
-            android:padding="10dp"
-            android:layout_gravity="center"
-            android:background="@drawable/circle_tintable"
-            android:backgroundTint="@color/green_400"
-            android:gravity="center_vertical"
-            android:src="@drawable/ic_lock_white_48dp"
-            android:visibility="gone"
-            tools:visibility="visible"/>
-
-
-</merge>
\ No newline at end of file
diff --git a/res/layout/verify_display_fragment.xml b/res/layout/verify_display_fragment.xml
deleted file mode 100644
index 2c94a73ef..000000000
--- a/res/layout/verify_display_fragment.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            xmlns:tools="http://schemas.android.com/tools"
-            android:fillViewport="true">
-
-    <LinearLayout android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:padding="20dp"
-                  android:gravity="center_horizontal"
-                  android:background="?verification_background"
-                  android:orientation="vertical">
-
-        <FrameLayout android:layout_width="250dp"
-                     android:layout_height="250dp">
-
-            <TextView android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layout_gravity="center"
-                      android:textSize="20sp"
-                      android:text="@string/verify_display_fragment__loading"/>
-
-            <org.thoughtcrime.securesms.components.SquareImageView
-                    android:id="@+id/qr_code"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_margin="20dp"
-                    android:padding="20dp"
-                    android:background="@drawable/qr_code_background"
-                    android:visibility="invisible"
-                    tools:src="@drawable/splash_logo"
-                    tools:visibility="invisible"/>
-
-            <TextView android:id="@+id/tap_label"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layout_gravity="bottom|center_horizontal"
-                      android:layout_marginBottom="35dp"
-                      android:textColor="@color/gray50"
-                      android:textSize="11sp"
-                      android:visibility="invisible"
-                      android:text="@string/verify_display_fragment__tap_to_scan"/>
-
-            <org.thoughtcrime.securesms.components.SquareImageView
-                    android:id="@+id/qr_verified"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_margin="20dp"
-                    android:padding="20dp"
-                    android:src="@drawable/ic_check_white_48dp"
-                    android:background="@drawable/qr_code_background"
-                    android:backgroundTint="@color/green_500"
-                    android:visibility="gone"/>
-
-
-        </FrameLayout>
-
-
-        <TableLayout android:id="@+id/number_table"
-                     android:layout_width="wrap_content"
-                     android:layout_height="wrap_content"
-                     android:layout_marginTop="5dp"
-                     android:clickable="true"
-                     android:focusable="true">
-
-            <TableRow android:gravity="center_horizontal"
-                      android:clickable="false"
-                      android:focusable="false">
-
-                <TextView android:id="@+id/code_first"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          style="@style/IdentityKey"
-                          tools:text="22934"/>
-
-                <TextView android:id="@+id/code_second"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:layout_marginLeft="20dp"
-                          style="@style/IdentityKey"
-                          tools:text="56944"/>
-
-                <TextView android:id="@+id/code_third"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:layout_marginLeft="20dp"
-                          style="@style/IdentityKey"
-                          tools:text="42738"/>
-
-                <TextView android:id="@+id/code_fourth"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:layout_marginLeft="20dp"
-                          style="@style/IdentityKey"
-                          tools:text="20038"/>
-            </TableRow>
-
-            <TableRow android:gravity="center_horizontal">
-                <TextView android:id="@+id/code_fifth"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          style="@style/IdentityKey"
-                          tools:text="34431"/>
-
-                <TextView android:id="@+id/code_sixth"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:layout_marginLeft="20dp"
-                          style="@style/IdentityKey"
-                          tools:text="24922"/>
-
-                <TextView android:id="@+id/code_seventh"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:layout_marginLeft="20dp"
-                          style="@style/IdentityKey"
-                          tools:text="58594"/>
-
-                <TextView android:id="@+id/code_eighth"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:layout_marginLeft="20dp"
-                          style="@style/IdentityKey"
-                          tools:text="24109"/>
-            </TableRow>
-
-            <TableRow android:gravity="center_horizontal">
-                <TextView android:id="@+id/code_ninth"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          style="@style/IdentityKey"
-                          tools:text="00257"/>
-
-                <TextView android:id="@+id/code_tenth"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:layout_marginLeft="20dp"
-                          style="@style/IdentityKey"
-                          tools:text="34956"/>
-
-                <TextView android:id="@+id/code_eleventh"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:layout_marginLeft="20dp"
-                          style="@style/IdentityKey"
-                          tools:text="32440"/>
-
-                <TextView android:id="@+id/code_twelth"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:layout_marginLeft="20dp"
-                          style="@style/IdentityKey"
-                          tools:text="15774"/>
-            </TableRow>
-        </TableLayout>
-
-        <LinearLayout android:orientation="horizontal"
-                      android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:layout_marginTop="10dp"
-                      android:paddingLeft="20dp">
-
-            <android.support.v7.widget.SwitchCompat
-                    android:id="@+id/verified_switch"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-
-            <TextView
-                    android:layout_marginLeft="5dp"
-                    android:textSize="17dp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/verify_display_fragment__verified"/>
-
-        </LinearLayout>
-
-        <TextView android:id="@+id/description"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:layout_marginTop="15dp"
-                  android:textSize="17sp"
-                  android:lineSpacingExtra="3sp"
-                  android:text="@string/verify_display_fragment__if_you_wish_to_verify_the_security_of_your_end_to_end_encryption_with_s"/>
-
-
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/res/layout/verify_scan_fragment.xml b/res/layout/verify_scan_fragment.xml
deleted file mode 100644
index d379c6002..000000000
--- a/res/layout/verify_scan_fragment.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout android:layout_width="match_parent"
-             android:layout_height="match_parent"
-             xmlns:android="http://schemas.android.com/apk/res/android"
-             xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <org.thoughtcrime.securesms.components.camera.CameraView
-            android:id="@+id/scanner"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:camera="0"/>
-
-    <LinearLayout android:id="@+id/overlay"
-                  android:layout_width="match_parent"
-                  android:layout_height="match_parent"
-                  android:orientation="vertical">
-
-        <org.thoughtcrime.securesms.components.ShapeScrim
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:radius="0.3"
-                app:shape="circle"/>
-
-
-    </LinearLayout>
-
-</FrameLayout>
diff --git a/res/layout/webrtc_answer_decline_button.xml b/res/layout/webrtc_answer_decline_button.xml
deleted file mode 100644
index de80ede2b..000000000
--- a/res/layout/webrtc_answer_decline_button.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:tools="http://schemas.android.com/tools"
-       android:clipToPadding="false"
-       android:layout_width="wrap_content"
-       android:layout_height="wrap_content"
-       tools:parentTag="android.widget.LinearLayout"
-       tools:orientation="vertical">
-
-    <ImageView android:id="@+id/arrow_one"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:layout_gravity="center_horizontal"
-               android:layout_marginBottom="-15dp"
-               android:alpha="0"
-               android:src="@drawable/ic_keyboard_arrow_up_white_36dp"
-               android:tint="@color/gray20"
-               tools:alpha="1"/>
-
-    <ImageView android:id="@+id/arrow_two"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:layout_gravity="center_horizontal"
-               android:layout_marginBottom="-15dp"
-               android:alpha="0"
-               android:src="@drawable/ic_keyboard_arrow_up_white_36dp"
-               android:tint="@color/gray20"
-               tools:alpha="1"/>
-
-    <ImageView android:id="@+id/arrow_three"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:layout_gravity="center_horizontal"
-               android:layout_marginBottom="-15dp"
-               android:alpha="0"
-               android:src="@drawable/ic_keyboard_arrow_up_white_36dp"
-               android:tint="@color/gray20"
-               tools:alpha="1"/>
-
-    <ImageView android:id="@+id/arrow_four"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:layout_gravity="center_horizontal"
-               android:layout_marginBottom="10dp"
-               android:alpha="0"
-               android:src="@drawable/ic_keyboard_arrow_up_white_36dp"
-               android:tint="@color/gray20"
-               tools:alpha="1"/>
-
-    <TextView android:id="@+id/swipe_up_text"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_gravity="center_horizontal"
-              android:layout_marginBottom="19dp"
-              android:textColor="@color/gray20"
-              android:textStyle="italic"
-              android:shadowColor="#94000000"
-              android:shadowDx="2"
-              android:shadowDy="2"
-              android:shadowRadius="4"
-              android:text="@string/webrtc_answer_decline_button__swipe_up_to_answer"/>
-
-    <ImageView android:id="@+id/answer"
-               android:layout_width="56dp"
-               android:layout_height="56dp"
-               android:layout_gravity="center_horizontal"
-               android:padding="12dp"
-               android:elevation="5dp"
-               android:background="@drawable/circle_tintable"
-               android:src="@drawable/ic_phone_grey600_32dp"
-               android:tint="@color/green_600"/>
-
-    <TextView android:id="@+id/swipe_down_text"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_gravity="center_horizontal"
-              android:layout_marginTop="16dp"
-              android:textStyle="italic"
-              android:textColor="@color/gray20"
-              android:shadowColor="#94000000"
-              android:shadowDx="2"
-              android:shadowDy="2"
-              android:shadowRadius="4"
-              android:text="@string/webrtc_answer_decline_button__swipe_down_to_reject"/>
-
-
-</merge>
\ No newline at end of file
diff --git a/res/layout/webrtc_call_activity.xml b/res/layout/webrtc_call_activity.xml
deleted file mode 100644
index 6611afd96..000000000
--- a/res/layout/webrtc_call_activity.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent">
-
-    <org.thoughtcrime.securesms.components.webrtc.WebRtcCallScreen android:id="@+id/callScreen"
-                                                                   android:layout_width="fill_parent"
-                                                                   android:layout_height="fill_parent" />
-
-
-</FrameLayout>
diff --git a/res/layout/webrtc_call_controls.xml b/res/layout/webrtc_call_controls.xml
deleted file mode 100644
index 45615de8f..000000000
--- a/res/layout/webrtc_call_controls.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-                    xmlns:tools="http://schemas.android.com/tools"
-              android:id="@+id/inCallControls"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:orientation="horizontal"
-              tools:background="@color/textsecure_primary">
-
-        <org.thoughtcrime.securesms.components.AccessibleToggleButton
-                android:id="@+id/speakerButton"
-                style="@style/WebRtcCallCompoundButton"
-                android:background="@drawable/webrtc_speaker_button"
-                tools:checked="true"
-                android:layout_marginRight="15dp"/>
-
-        <org.thoughtcrime.securesms.components.AccessibleToggleButton
-                android:id="@+id/bluetoothButton"
-                style="@style/WebRtcCallCompoundButton"
-                android:background="@drawable/webrtc_bluetooth_button"
-                tools:checked="true"
-                android:layout_marginRight="15dp"
-                android:visibility="gone"/>
-
-        <org.thoughtcrime.securesms.components.AccessibleToggleButton
-                android:id="@+id/muteButton"
-                style="@style/WebRtcCallCompoundButton"
-                android:background="@drawable/webrtc_mute_button"
-                android:contentDescription="@string/redphone_call_controls__mute"
-                android:layout_marginRight="15dp"
-                tools:checked="false"
-                />
-
-        <org.thoughtcrime.securesms.components.AccessibleToggleButton
-                android:id="@+id/video_mute_button"
-                style="@style/WebRtcCallCompoundButton"
-                android:layout_marginRight="15dp"
-                android:background="@drawable/webrtc_video_mute_button"/>
-
-        <org.thoughtcrime.securesms.components.AccessibleToggleButton
-                android:id="@+id/camera_flip_button"
-                style="@style/WebRtcCallCompoundButton"
-                android:contentDescription="@string/redphone_call_controls__flip_camera_rear"
-                android:background="@drawable/webrtc_camera_rear_button"
-                android:visibility="gone"/>
-
-</merge>
diff --git a/res/layout/webrtc_call_screen.xml b/res/layout/webrtc_call_screen.xml
deleted file mode 100644
index 6c78a9f07..000000000
--- a/res/layout/webrtc_call_screen.xml
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             xmlns:tools="http://schemas.android.com/tools"
-             xmlns:app="http://schemas.android.com/apk/res-auto"
-             android:id="@+id/incall_screen"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent">
-
-    <org.thoughtcrime.securesms.components.webrtc.PercentFrameLayout
-            android:id="@+id/remote_render_layout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:visibility="invisible"/>
-
-    <!-- "Call info" block #1, for the foreground call. -->
-    <RelativeLayout android:id="@+id/call_info_1"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:animateLayoutChanges="true">
-
-        <!-- Contact photo for call_info_1 -->
-        <FrameLayout android:id="@+id/image_container"
-                     android:layout_below="@+id/call_banner_1"
-                     android:gravity="top|center_horizontal"
-                     android:layout_width="match_parent"
-                     android:layout_height="match_parent">
-
-            <ImageView android:id="@+id/photo"
-                       android:layout_width="match_parent"
-                       android:layout_height="match_parent"
-                       android:scaleType="centerCrop"
-                       android:visibility="visible"
-                       android:clickable="true"
-                       tools:src="@drawable/ic_person_large"
-                    />
-
-            <LinearLayout android:id="@+id/untrusted_layout"
-                          android:layout_width="match_parent"
-                          android:layout_height="match_parent"
-                          android:background="@color/grey_400"
-                          android:orientation="vertical"
-                          android:visibility="gone"
-                          android:gravity="center"
-                          android:clickable="true">
-
-                <TextView android:id="@+id/untrusted_explanation"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:layout_gravity="center"
-                          android:textSize="16sp"
-                          android:maxWidth="270dp"
-                          android:lineSpacingExtra="2sp"
-                          tools:text="The safety numbers for your conversation with Masha have changed. This could either mean that someone is trying to intercept your communication, or that Masha simply re-installed Signal. You may wish to verify safety numbers for this contact."/>
-
-                <LinearLayout
-                        android:layout_marginTop="20dp"
-                        android:maxWidth="250dp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content">
-
-                    <Button android:id="@+id/accept_safety_numbers"
-                            android:text="@string/WebRtcCallScreen_accept"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginRight="10dp"/>
-
-                    <Button android:id="@+id/cancel_safety_numbers"
-                            android:text="@android:string/cancel"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"/>
-
-                </LinearLayout>
-
-
-            </LinearLayout>
-
-
-        </FrameLayout>
-
-        <!-- "Call Banner" for call #1, the foregound or ringing call.
-             The "call banner" is a block of info about a single call,
-             including the contact name, phone number, call time counter,
-             and other status info.  This info is shown as a "banner"
-             overlaid across the top of contact photo. -->
-        <LinearLayout android:id="@+id/call_banner_1"
-                        android:layout_alignParentTop="true"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:minHeight="80dp"
-                        android:orientation="vertical">
-
-            <RelativeLayout android:id="@+id/expanded_info"
-                            android:background="@color/textsecure_primary"
-                            android:paddingLeft="24dp"
-                            android:paddingRight="24dp"
-                            android:paddingTop="16dp"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:clickable="true">
-
-
-                <!-- Name (or the phone number, if we don't have a name to display). -->
-                <TextView android:id="@+id/name"
-                          android:layout_alignParentTop="true"
-                          android:layout_alignParentLeft="true"
-                          android:layout_width="match_parent"
-                          android:layout_height="wrap_content"
-                          android:paddingRight="50sp"
-                          android:textSize="40sp"
-                          android:textColor="#FFFFFF"
-                          android:singleLine="true"
-                          android:maxLines="1"
-                          android:ellipsize="end"
-                          tools:text="Ali Connors"
-                        />
-
-                <!-- Label (like "Mobile" or "Work", if present) and phone number, side by side -->
-                <LinearLayout android:id="@+id/labelAndNumber"
-                              android:layout_below="@id/name"
-                              android:layout_width="wrap_content"
-                              android:layout_height="wrap_content"
-                              android:paddingRight="50sp"
-                              android:orientation="horizontal"
-                        >
-                    <TextView android:id="@+id/label"
-                              android:layout_width="wrap_content"
-                              android:layout_height="wrap_content"
-                              android:textColor="#FFFFFF"
-                              android:singleLine="true"
-                              android:textAppearance="?android:attr/textAppearanceSmall"
-                              android:text="@string/redphone_call_card__signal_call"
-                              android:layout_marginRight="10dp"
-                            />
-                    <TextView android:id="@+id/phoneNumber"
-                              android:layout_width="wrap_content"
-                              android:layout_height="wrap_content"
-                              android:textAppearance="?android:attr/textAppearanceSmall"
-                              android:textColor="#FFFFFF"
-                              android:singleLine="true"
-                              tools:text="+14152222222"
-                            />
-
-                </LinearLayout>
-
-                <!-- Elapsed time indication for a call in progress. -->
-                <TextView android:id="@+id/elapsedTime"
-                          android:layout_alignParentRight="true"
-                          android:layout_centerVertical="true"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:textAppearance="?android:attr/textAppearanceMedium"
-                          android:textColor="#FFFFFF"
-                          android:singleLine="true"
-                        />
-
-            </RelativeLayout>
-
-            <org.thoughtcrime.securesms.components.webrtc.WebRtcCallControls
-                    android:id="@+id/inCallControls"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@color/textsecure_primary"
-                    android:paddingLeft="24dp"
-                    android:paddingRight="24dp"
-                    android:paddingTop="16dp"
-                    android:paddingBottom="20dp"
-                    android:clickable="true"/>
-
-            <TextView android:id="@+id/callStateLabel"
-                      android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:gravity="right"
-                      android:paddingTop="8dp"
-                      android:paddingBottom="8dp"
-                      android:paddingRight="24dp"
-                      android:textAppearance="?android:attr/textAppearanceSmall"
-                      android:textColor="#FFFFFF"
-                      android:textAllCaps="true"
-                      android:background="#8033b5e5"
-                      tools:text="connected"
-                    />
-
-        </LinearLayout>  <!-- End of call_banner for call_info #1. -->
-
-        <!-- The "call state label": In some states, this shows a special
-             indication like "Dialing" or "Incoming call" or "Call ended".
-             It's unused for the normal case of an active ongoing call. -->
-        <!-- This is visually part of the call banner, but it's not actually
-             part of the "call_banner_1" RelativeLayout since it needs a
-             different background color. -->
-
-    </RelativeLayout>
-
-    <org.thoughtcrime.securesms.components.webrtc.PercentFrameLayout
-            android:id="@+id/local_render_layout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:visibility="invisible"/>
-
-    <android.support.design.widget.FloatingActionButton
-            android:id="@+id/hangup_fab"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="40dp"
-            android:layout_gravity="bottom|center_horizontal"
-            android:src="@drawable/ic_call_end_white_48dp"
-            android:focusable="true"
-            app:backgroundTint="@color/red_500"
-            android:visibility="visible"
-            android:contentDescription="@string/WebRtcCallScreen_end_call"
-            tools:visibility="visible"/>
-
-
-    <org.thoughtcrime.securesms.components.webrtc.WebRtcAnswerDeclineButton
-            android:id="@+id/answer_decline_button"
-            android:layout_gravity="bottom|center"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"/>
-
-</android.support.design.widget.CoordinatorLayout>
diff --git a/res/menu/verify_display_fragment_context_menu.xml b/res/menu/verify_display_fragment_context_menu.xml
deleted file mode 100644
index db095c5b9..000000000
--- a/res/menu/verify_display_fragment_context_menu.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:id="@+id/menu_copy"
-          android:title="@string/verify_display_fragment_context_menu__copy_to_clipboard"/>
-
-    <item android:id="@+id/menu_compare"
-          android:title="@string/verify_display_fragment_context_menu__compare_with_clipboard"/>
-
-</menu>
diff --git a/res/menu/verify_identity.xml b/res/menu/verify_identity.xml
deleted file mode 100644
index 6163830bf..000000000
--- a/res/menu/verify_identity.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto" >
-    <item android:id="@+id/verify_identity__share"
-          android:title="@string/verify_identity__share_safety_number"
-          android:icon="@drawable/ic_share_white_24dp"
-          app:showAsAction="ifRoom" />
-</menu>
diff --git a/res/raw/censorship_fronting.store b/res/raw/censorship_fronting.store
deleted file mode 100644
index 88b3f4376..000000000
Binary files a/res/raw/censorship_fronting.store and /dev/null differ
diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/src/org/thoughtcrime/securesms/ApplicationContext.java
index ce53a47d0..7115c334c 100644
--- a/src/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/src/org/thoughtcrime/securesms/ApplicationContext.java
@@ -21,10 +21,8 @@ import android.arch.lifecycle.DefaultLifecycleObserver;
 import android.arch.lifecycle.LifecycleOwner;
 import android.arch.lifecycle.ProcessLifecycleOwner;
 import android.content.Context;
-import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.multidex.MultiDexApplication;
-import android.util.Log;
 
 import com.b44t.messenger.DcContext;
 import com.b44t.messenger.DcEventCenter;
@@ -36,16 +34,9 @@ import org.thoughtcrime.securesms.jobmanager.persistence.JavaJobSerializer;
 import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.util.ScreenLockUtil;
 import org.thoughtcrime.securesms.util.Util;
-import org.webrtc.PeerConnectionFactory;
-import org.webrtc.PeerConnectionFactory.InitializationOptions;
-import org.webrtc.voiceengine.WebRtcAudioManager;
-import org.webrtc.voiceengine.WebRtcAudioUtils;
 import org.whispersystems.libsignal.logging.SignalProtocolLoggerProvider;
 import org.thoughtcrime.securesms.util.AndroidSignalProtocolLogger;
 
-import java.util.HashSet;
-import java.util.Set;
-
 /**
  * Will be called once when the TextSecure process is created.
  *
@@ -78,9 +69,7 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     initializeRandomNumberFix();
     initializeLogging();
     initializeJobManager();
-    //initializeSignedPreKeyCheck(); -- keys are generated in the core, however, not sure if this is needed for the lock screen
     initializePeriodicTasks();
-    initializeWebRtc();
     initializeIncomingMessageNotifier();
     ProcessLifecycleOwner.get().getLifecycle().addObserver(this);
   }
@@ -152,38 +141,4 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     //  UpdateApkRefreshListener.schedule(this);
     //}
   }
-
-  private void initializeWebRtc() {
-    try {
-      Set<String> HARDWARE_AEC_BLACKLIST = new HashSet<String>() {{
-        add("Pixel");
-        add("Pixel XL");
-        add("Moto G5");
-        add("Moto G (5S) Plus");
-        add("Moto G4");
-        add("TA-1053");
-        add("Mi A1");
-        add("E5823"); // Sony z5 compact
-      }};
-
-      Set<String> OPEN_SL_ES_WHITELIST = new HashSet<String>() {{
-        add("Pixel");
-        add("Pixel XL");
-      }};
-
-      if (HARDWARE_AEC_BLACKLIST.contains(Build.MODEL)) {
-        WebRtcAudioUtils.setWebRtcBasedAcousticEchoCanceler(true);
-      }
-
-      if (!OPEN_SL_ES_WHITELIST.contains(Build.MODEL)) {
-        WebRtcAudioManager.setBlacklistDeviceForOpenSLESUsage(true);
-      }
-
-      PeerConnectionFactory.initialize(InitializationOptions.builder(this)
-                                                            .setEnableVideoHwAcceleration(true)
-                                                            .createInitializationOptions());
-    } catch (UnsatisfiedLinkError e) {
-      Log.w(TAG, e);
-    }
-  }
 }
diff --git a/src/org/thoughtcrime/securesms/components/webrtc/PercentFrameLayout.java b/src/org/thoughtcrime/securesms/components/webrtc/PercentFrameLayout.java
deleted file mode 100644
index 9011d07b6..000000000
--- a/src/org/thoughtcrime/securesms/components/webrtc/PercentFrameLayout.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- *  Copyright 2015 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-package org.thoughtcrime.securesms.components.webrtc;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.Xfermode;
-import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewGroup;
-
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * Simple container that confines the children to a subrectangle specified as percentage values of
- * the container size. The children are centered horizontally and vertically inside the confined
- * space.
- */
-public class PercentFrameLayout extends ViewGroup {
-  private int xPercent = 0;
-  private int yPercent = 0;
-  private int widthPercent = 100;
-  private int heightPercent = 100;
-
-  private boolean square = false;
-  private boolean hidden = false;
-
-  public PercentFrameLayout(Context context) {
-    super(context);
-  }
-
-  public PercentFrameLayout(Context context, AttributeSet attrs) {
-    super(context, attrs);
-  }
-
-  public PercentFrameLayout(Context context, AttributeSet attrs, int defStyleAttr) {
-    super(context, attrs, defStyleAttr);
-  }
-
-  public void setSquare(boolean square) {
-    this.square = square;
-  }
-
-  public void setHidden(boolean hidden) {
-    this.hidden = hidden;
-  }
-
-  public boolean isHidden() {
-    return this.hidden;
-  }
-
-  public void setPosition(int xPercent, int yPercent, int widthPercent, int heightPercent) {
-    this.xPercent = xPercent;
-    this.yPercent = yPercent;
-    this.widthPercent = widthPercent;
-    this.heightPercent = heightPercent;
-  }
-
-  @Override
-  public boolean shouldDelayChildPressedState() {
-    return false;
-  }
-
-  @Override
-  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-    final int width = getDefaultSize(Integer.MAX_VALUE, widthMeasureSpec);
-    final int height = getDefaultSize(Integer.MAX_VALUE, heightMeasureSpec);
-
-    setMeasuredDimension(MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
-                         MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY));
-
-    int childWidth  = width * widthPercent / 100;
-    int childHeight = height * heightPercent / 100;
-
-    if (square) {
-      if (width > height) childWidth  = childHeight;
-      else                childHeight = childWidth;
-    }
-
-    if (hidden) {
-      childWidth  = 1;
-      childHeight = 1;
-    }
-
-    int childWidthMeasureSpec  = MeasureSpec.makeMeasureSpec(childWidth, MeasureSpec.AT_MOST);
-    int childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(childHeight, MeasureSpec.AT_MOST);
-
-    for (int i = 0; i < getChildCount(); ++i) {
-      final View child = getChildAt(i);
-      if (child.getVisibility() != GONE) {
-        child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
-      }
-    }
-  }
-
-  @Override
-  protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-    final int width = right - left;
-    final int height = bottom - top;
-    // Sub-rectangle specified by percentage values.
-    final int subWidth = width * widthPercent / 100;
-    final int subHeight = height * heightPercent / 100;
-    final int subLeft = left + width * xPercent / 100;
-    final int subTop = top + height * yPercent / 100;
-
-
-    for (int i = 0; i < getChildCount(); ++i) {
-      final View child = getChildAt(i);
-      if (child.getVisibility() != GONE) {
-        final int childWidth = child.getMeasuredWidth();
-        final int childHeight = child.getMeasuredHeight();
-        // Center child both vertically and horizontally.
-        int childLeft = subLeft + (subWidth - childWidth) / 2;
-        int childTop = subTop + (subHeight - childHeight) / 2;
-
-        if (hidden) {
-          childLeft = 0;
-          childTop  = 0;
-        }
-
-        child.layout(childLeft, childTop, childLeft + childWidth, childTop + childHeight);
-      }
-    }
-  }
-}
diff --git a/src/org/thoughtcrime/securesms/components/webrtc/WebRtcAnswerDeclineButton.java b/src/org/thoughtcrime/securesms/components/webrtc/WebRtcAnswerDeclineButton.java
deleted file mode 100644
index 54753935e..000000000
--- a/src/org/thoughtcrime/securesms/components/webrtc/WebRtcAnswerDeclineButton.java
+++ /dev/null
@@ -1,312 +0,0 @@
-package org.thoughtcrime.securesms.components.webrtc;
-
-
-import android.animation.Animator;
-import android.animation.AnimatorSet;
-import android.animation.ArgbEvaluator;
-import android.animation.ObjectAnimator;
-import android.content.Context;
-import android.graphics.Color;
-import android.os.Build;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.animation.AccelerateInterpolator;
-import android.view.animation.DecelerateInterpolator;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.util.ViewUtil;
-
-public class WebRtcAnswerDeclineButton extends LinearLayout implements View.OnTouchListener {
-
-  @SuppressWarnings("unused")
-  private static final String TAG = WebRtcAnswerDeclineButton.class.getSimpleName();
-
-  private static final int TOTAL_TIME = 1000;
-  private static final int SHAKE_TIME = 200;
-
-  private static final int UP_TIME       = (TOTAL_TIME - SHAKE_TIME) / 2;
-  private static final int DOWN_TIME     = (TOTAL_TIME - SHAKE_TIME) / 2;
-  private static final int FADE_OUT_TIME = 300;
-  private static final int FADE_IN_TIME  = 100;
-  private static final int SHIMMER_TOTAL = UP_TIME + SHAKE_TIME;
-
-  private static final int ANSWER_THRESHOLD  = 112;
-  private static final int DECLINE_THRESHOLD = 56;
-
-  private TextView  swipeUpText;
-  private ImageView fab;
-  private TextView  swipeDownText;
-
-  private ImageView arrowOne;
-  private ImageView arrowTwo;
-  private ImageView arrowThree;
-  private ImageView arrowFour;
-
-  private float lastY;
-
-  private boolean animating = false;
-  private boolean complete  = false;
-
-  private AnimatorSet animatorSet;
-  private AnswerDeclineListener listener;
-
-  public WebRtcAnswerDeclineButton(Context context) {
-    super(context);
-    initialize();
-  }
-
-  public WebRtcAnswerDeclineButton(Context context, @Nullable AttributeSet attrs) {
-    super(context, attrs);
-    initialize();
-  }
-
-  public WebRtcAnswerDeclineButton(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
-    super(context, attrs, defStyleAttr);
-    initialize();
-  }
-
-  @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-  public WebRtcAnswerDeclineButton(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-    super(context, attrs, defStyleAttr, defStyleRes);
-    initialize();
-  }
-
-  private void initialize() {
-    setOrientation(LinearLayout.VERTICAL);
-    setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-
-    inflate(getContext(), R.layout.webrtc_answer_decline_button, this);
-
-    this.swipeUpText   = findViewById(R.id.swipe_up_text);
-    this.fab           = findViewById(R.id.answer);
-    this.swipeDownText = findViewById(R.id.swipe_down_text);
-
-    this.arrowOne   = findViewById(R.id.arrow_one);
-    this.arrowTwo   = findViewById(R.id.arrow_two);
-    this.arrowThree = findViewById(R.id.arrow_three);
-    this.arrowFour  = findViewById(R.id.arrow_four);
-
-    this.fab.setOnTouchListener(this);
-  }
-
-  public void startRingingAnimation() {
-    if (!animating) {
-      animating = true;
-      animateElements(0);
-    }
-  }
-
-  public void stopRingingAnimation() {
-    if (animating) {
-      animating = false;
-      resetElements();
-    }
-  }
-
-  public void setAnswerDeclineListener(AnswerDeclineListener listener) {
-    this.listener = listener;
-  }
-
-  @Override
-  public boolean onTouch(View v, MotionEvent event) {
-
-    switch (event.getAction()) {
-      case MotionEvent.ACTION_DOWN:
-        resetElements();
-        swipeUpText.animate().alpha(0).setDuration(200).start();
-        swipeDownText.animate().alpha(0).setDuration(200).start();
-        lastY = event.getRawY();
-        break;
-      case MotionEvent.ACTION_CANCEL:
-      case MotionEvent.ACTION_UP:
-        swipeUpText.clearAnimation();
-        swipeDownText.clearAnimation();
-        swipeUpText.setAlpha(1);
-        swipeDownText.setAlpha(1);
-        fab.setRotation(0);
-
-        if (Build.VERSION.SDK_INT >= 21) {
-          fab.getDrawable().setTint(getResources().getColor(R.color.green_600));
-          fab.getBackground().setTint(Color.WHITE);
-        }
-
-        animating = true;
-        animateElements(0);
-        break;
-      case MotionEvent.ACTION_MOVE:
-        float difference = event.getRawY() - lastY;
-
-        float differenceThreshold;
-        float percentageToThreshold;
-        int   backgroundColor;
-        int   foregroundColor;
-
-        if (difference <= 0) {
-          differenceThreshold   = ViewUtil.dpToPx(getContext(), ANSWER_THRESHOLD);
-          percentageToThreshold = Math.min(1, (difference * -1) / differenceThreshold);
-          backgroundColor       = (int) new ArgbEvaluator().evaluate(percentageToThreshold, getResources().getColor(R.color.green_100), getResources().getColor(R.color.green_600));
-
-          if (percentageToThreshold > 0.5) {
-            foregroundColor = Color.WHITE;
-          } else {
-            foregroundColor = getResources().getColor(R.color.green_600);
-          }
-
-          fab.setTranslationY(difference);
-
-          if (percentageToThreshold == 1 && listener != null) {
-            fab.setVisibility(View.INVISIBLE);
-            lastY = event.getRawY();
-            if (!complete) {
-              complete = true;
-              listener.onAnswered();
-            }
-          }
-        } else {
-          differenceThreshold = ViewUtil.dpToPx(getContext(), DECLINE_THRESHOLD);
-          percentageToThreshold = Math.min(1, difference / differenceThreshold);
-          backgroundColor = (int) new ArgbEvaluator().evaluate(percentageToThreshold, getResources().getColor(R.color.red_100), getResources().getColor(R.color.red_600));
-
-          if (percentageToThreshold > 0.5) {
-            foregroundColor = Color.WHITE;
-          } else {
-            foregroundColor = getResources().getColor(R.color.green_600);
-          }
-
-          fab.setRotation(135 * percentageToThreshold);
-
-          if (percentageToThreshold == 1 && listener != null) {
-            fab.setVisibility(View.INVISIBLE);
-            lastY = event.getRawY();
-
-            if (!complete) {
-              complete = true;
-              listener.onDeclined();
-            }
-          }
-        }
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-          fab.getBackground().setTint(backgroundColor);
-          fab.getDrawable().setTint(foregroundColor);
-        }
-
-        break;
-    }
-
-    return true;
-  }
-
-  private void animateElements(int delay) {
-    ObjectAnimator fabUp    = getUpAnimation(fab);
-    ObjectAnimator fabDown  = getDownAnimation(fab);
-    ObjectAnimator fabShake = getShakeAnimation(fab);
-
-    animatorSet = new AnimatorSet();
-    animatorSet.play(fabUp).with(getUpAnimation(swipeUpText));
-    animatorSet.play(fabShake).after(fabUp);
-    animatorSet.play(fabDown).with(getDownAnimation(swipeUpText)).after(fabShake);
-
-    animatorSet.play(getFadeOut(swipeDownText)).with(fabUp);
-    animatorSet.play(getFadeIn(swipeDownText)).after(fabDown);
-
-    animatorSet.play(getShimmer(arrowFour, arrowThree, arrowTwo, arrowOne));
-
-    animatorSet.addListener(new Animator.AnimatorListener() {
-      @Override
-      public void onAnimationStart(Animator animation) {
-      }
-
-      @Override
-      public void onAnimationEnd(Animator animation) {
-        if (animating) animateElements(1000);
-      }
-
-      @Override
-      public void onAnimationCancel(Animator animation) {}
-      @Override
-      public void onAnimationRepeat(Animator animation) {}
-    });
-
-    animatorSet.setStartDelay(delay);
-    animatorSet.start();
-  }
-
-  private Animator getShimmer(View... targets) {
-    AnimatorSet animatorSet  = new AnimatorSet();
-    int         evenDuration = SHIMMER_TOTAL / targets.length;
-    int         interval     = 75;
-
-    for (int i=0;i<targets.length;i++) {
-      animatorSet.play(getShimmer(targets[i], evenDuration + (evenDuration - interval)))
-                 .after(interval * i);
-    }
-
-    return animatorSet;
-  }
-
-  private ObjectAnimator getShimmer(View target, int duration) {
-    ObjectAnimator shimmer = ObjectAnimator.ofFloat(target, "alpha", 0, 1, 0);
-    shimmer.setDuration(duration);
-
-    return shimmer;
-  }
-
-  private ObjectAnimator getShakeAnimation(View target) {
-    ObjectAnimator animator = ObjectAnimator.ofFloat(target, "translationX", 0, 25, -25, 25, -25,15, -15, 6, -6, 0);
-    animator.setDuration(SHAKE_TIME);
-
-    return animator;
-  }
-
-  private ObjectAnimator getUpAnimation(View target) {
-    ObjectAnimator animator = ObjectAnimator.ofFloat(target, "translationY", 0, -1 * ViewUtil.dpToPx(getContext(), 32));
-    animator.setInterpolator(new AccelerateInterpolator());
-    animator.setDuration(UP_TIME);
-
-    return animator;
-  }
-
-  private ObjectAnimator getDownAnimation(View target) {
-    ObjectAnimator animator = ObjectAnimator.ofFloat(target, "translationY", 0);
-    animator.setInterpolator(new DecelerateInterpolator());
-    animator.setDuration(DOWN_TIME);
-
-    return animator;
-  }
-
-  private ObjectAnimator getFadeOut(View target) {
-    ObjectAnimator animator = ObjectAnimator.ofFloat(target, "alpha", 1, 0);
-    animator.setDuration(FADE_OUT_TIME);
-    return animator;
-  }
-
-  private ObjectAnimator getFadeIn(View target) {
-    ObjectAnimator animator = ObjectAnimator.ofFloat(target, "alpha", 0, 1);
-    animator.setDuration(FADE_IN_TIME);
-    return animator;
-  }
-
-  private void resetElements() {
-    animating = false;
-    complete  = false;
-    
-    if (animatorSet != null) animatorSet.cancel();
-
-    swipeUpText.setTranslationY(0);
-    fab.setTranslationY(0);
-    swipeDownText.setAlpha(1);
-  }
-
-  public interface AnswerDeclineListener {
-    void onAnswered();
-    void onDeclined();
-  }
-}
diff --git a/src/org/thoughtcrime/securesms/database/model/DisplayRecord.java b/src/org/thoughtcrime/securesms/database/model/DisplayRecord.java
index 1519f5bb2..b250268ae 100644
--- a/src/org/thoughtcrime/securesms/database/model/DisplayRecord.java
+++ b/src/org/thoughtcrime/securesms/database/model/DisplayRecord.java
@@ -37,19 +37,17 @@ public abstract class DisplayRecord {
   protected final long type;
 
   private final Recipient  recipient;
-  private final long       dateSent;
   private final long       dateReceived;
   private final long       threadId;
   private final String     body;
 
   DisplayRecord(Context context, String body, Recipient recipient, long dateSent,
                 long dateReceived, long threadId, int deliveryStatus, int deliveryReceiptCount,
-                long type, int readReceiptCount)
+                long type)
   {
     this.context              = context.getApplicationContext();
     this.threadId             = threadId;
     this.recipient            = recipient;
-    this.dateSent             = dateSent;
     this.dateReceived         = dateReceived;
     this.type                 = type;
     this.body                 = body;
diff --git a/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java b/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java
index cdcc8a100..9ed0b10d8 100644
--- a/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java
+++ b/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java
@@ -39,9 +39,7 @@ public class ThreadRecord extends DisplayRecord {
 
   private           final long    count;
   private           final int     unreadCount;
-  private           final int     distributionType;
   private           final boolean archived;
-  private           final long    expiresIn;
   private           final long    lastSeen;
   private           final boolean verified;
   private @Nullable final DcLot   dcSummary;
@@ -52,12 +50,10 @@ public class ThreadRecord extends DisplayRecord {
                       int distributionType, boolean archived, long expiresIn, long lastSeen,
                       int readReceiptCount, boolean verified, @Nullable DcLot dcSummary)
   {
-    super(context, body, recipient, date, date, threadId, status, deliveryReceiptCount, snippetType, readReceiptCount);
+    super(context, body, recipient, date, date, threadId, status, deliveryReceiptCount, snippetType);
     this.count            = count;
     this.unreadCount      = unreadCount;
-    this.distributionType = distributionType;
     this.archived         = archived;
-    this.expiresIn        = expiresIn;
     this.lastSeen         = lastSeen;
     this.verified         = verified;
     this.dcSummary        = dcSummary;
diff --git a/src/org/thoughtcrime/securesms/util/LinkedBlockingLifoQueue.java b/src/org/thoughtcrime/securesms/util/LinkedBlockingLifoQueue.java
deleted file mode 100644
index 1b07afee6..000000000
--- a/src/org/thoughtcrime/securesms/util/LinkedBlockingLifoQueue.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.thoughtcrime.securesms.util;
-
-
-import java.util.concurrent.LinkedBlockingDeque;
-
-public class LinkedBlockingLifoQueue<E> extends LinkedBlockingDeque<E> {
-  @Override
-  public void put(E runnable) throws InterruptedException {
-    super.putFirst(runnable);
-  }
-
-  @Override
-  public boolean add(E runnable) {
-    super.addFirst(runnable);
-    return true;
-  }
-
-  @Override
-  public boolean offer(E runnable) {
-    super.addFirst(runnable);
-    return true;
-  }
-}