diff --git a/res/layout/save_identity_activity.xml b/res/layout/save_identity_activity.xml
deleted file mode 100644
index 13043c2874..0000000000
--- a/res/layout/save_identity_activity.xml
+++ /dev/null
@@ -1,58 +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="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical" >
-
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="5dip"
-        android:layout_marginLeft="16dip"
-        android:layout_marginRight="16dip"
-        android:layout_marginTop="5dip"
-        android:text="@string/save_identity_activity__identity_name"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    <EditText
-        android:id="@+id/identity_name"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="16dip"
-        tools:ignore="TextFields" />
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="16dip"
-        android:gravity="right"
-        android:orientation="horizontal" >
-
-        <TableLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:stretchColumns="*"
-            tools:ignore="UselessParent" >
-
-            <TableRow>
-
-                <Button
-                    android:id="@+id/cancel_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="16dip"
-                    android:layout_marginRight="15dip"
-                    android:text="@android:string/cancel" />
-
-                <Button
-                    android:id="@+id/ok_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="16dip"
-                    android:text="@android:string/ok" />
-            </TableRow>
-        </TableLayout>
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/verify_imported_identity_activity.xml b/res/layout/verify_imported_identity_activity.xml
deleted file mode 100644
index 7bd0dc3825..0000000000
--- a/res/layout/verify_imported_identity_activity.xml
+++ /dev/null
@@ -1,64 +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">
-<TableLayout 
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:shrinkColumns="1">
-
-    <TableRow>
-        <TextView
-        	android:textSize="12sp"
-            android:text="@string/verify_import_identity_activity__identity_name_n"
-            android:padding="3dip" />
-        <EditText
-        	android:id="@+id/identity_name"
-            android:text=""
-            android:padding="3dip" />
-    </TableRow>
-
-
-    <TableRow>
-        <TextView
-        	android:textSize="12sp"
-            android:text="@string/verify_import_identity_activity__imported_identity_n"
-            android:padding="3dip" />
-        <TextView
-           	android:textSize="20sp"
-           	android:typeface="monospace"        
-        	android:id="@+id/imported_identity"
-            android:text=""
-            android:padding="3dip" />
-    </TableRow>
-    
-    <TableRow>
-    	<LinearLayout android:orientation="horizontal"
-    				  android:layout_width="fill_parent"
-    				  android:layout_height="wrap_content"
-    				  android:layout_gravity="center"
-    				  android:layout_span="2">
-
-	   		<Button android:id="@+id/verified_button"
-	   				android:padding="15dip"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="@string/verify_import_identity_activity__verified"/>
-
-	   		<Button android:id="@+id/compare_button"
-	   				android:padding="15dip"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="@string/verify_import_identity_activity__compare"/>
-						
-			<Button android:id="@+id/cancel_button"
-					android:padding="15dip"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="@android:string/cancel" />
-		</LinearLayout>
-    
-    </TableRow>    
-    
-</TableLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/res/menu/text_secure_locked.xml b/res/menu/text_secure_locked.xml
deleted file mode 100644
index b7b1b27849..0000000000
--- a/res/menu/text_secure_locked.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:title="@string/text_secure_locked__menu_unlock"
-          android:id="@+id/menu_unlock"
-          android:showAsAction="ifRoom" />
-
-</menu>
\ No newline at end of file
diff --git a/res/menu/verify_keys.xml b/res/menu/verify_keys.xml
deleted file mode 100644
index 578207c143..0000000000
--- a/res/menu/verify_keys.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:title="@string/verify_keys__menu_verified"
-          android:id="@+id/menu_session_verified"
-          android:icon="@drawable/ic_menu_done_holo_dark"
-          android:showAsAction="ifRoom" />
-</menu>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index dadc864e1c..7424a39ad2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4,31 +4,9 @@
     <string name="yes">Yes</string>
     <string name="no">No</string>
     <string name="delete">Delete</string>
-    
-    <!-- ApplicationExportManager -->
-    <string name="ApplicationExportManager_import_database_and_settings_title">Import Database and Settings?</string>
-    <string name="ApplicationExportManager_import_database_and_settings_message">Import TextSecure database, keys, and settings from the SD Card?\n\nWARNING: This will clobber any existing messages, keys, and settings!</string>
-    <string name="ApplicationExportManager_importing_database_and_keys">Importing Database and Keys</string>
-    <string name="ApplicationExportManager_importing_your_sms_database_keys_and_settings">Importing your SMS database, keys, and settings...</string>
-    <string name="ApplicationExportManager_export_database_question">Export Database?</string>
-    <string name="ApplicationExportManager_export_textsecure_database_keys_and_settings_prompt">Export TextSecure database, keys, and settings to the SD Card?</string>
-    <string name="ApplicationExportManager_exporting_database_and_keys">Exporting Database and Keys</string>
-    <string name="ApplicationExportManager_exporting_your_sms_database_keys_and_settings">Exporting your SMS database, keys, and settings...</string>
-    <string name="ApplicationExportManager_no_sd_card_found_exclamation">No SD card found!</string>
-    <string name="ApplicationExportManager_error_exporting_to_sd_exclamation">Error exporting to SD!</string>
-    <string name="ApplicationExportManager_import_successful_exclamation">Import Successful!</string>
-    <string name="ApplicationExportManager_export_successful_exclamation">Export Successful!</string>
-    <string name="ApplicationExportManager_import">Import</string>
-    <string name="ApplicationExportManager_export">Export</string>
-        
+
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferencesActivity_currently_s">Currently: %s</string>    
-    <string name="ApplicationPreferenceActivity_not_found_exclamation">Not found!</string>
-    <string name="ApplicationPreferenceActivity_no_valid_identity_key_was_found_in_the_specified_contact">No valid identity key was found in the specified contact.</string>
-    <string name="ApplicationPreferenceActivity_you_don_t_have_an_identity_key_exclamation">You don\'t have an identity key!</string>
-    <string name="ApplicationPreferenceActivity_you_have_not_yet_defined_a_contact_for_yourself">You have not yet defined a contact for yourself! Select one in the Settings menu.</string>
-    <string name="ApplicationPreferenceActivity_exported_to_contacts_database">Exported to contacts database!</string>
-    <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_importing_keys">You need to have entered your passphrase before importing keys...</string>
     <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">You need to have entered your passphrase before managing keys...</string>
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">You haven\'t set a passphrase yet!</string>
     <string name="ApplicationPreferencesActivity_messages_per_conversation">messages per conversation</string>
@@ -57,7 +35,6 @@
     <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">Unable to write to SD Card!</string>
     <string name="ConversationItem_view_secure_media_question">View secure media?</string>
     <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">This media has been stored in an encrypted database. Unfortunately, to view it with an external content viewer currently requires the data to be temporarily decrypted and written to disk.  Are you sure that you would like to do this?</string>
-    <string name="ConversationItem_key_exchange_message">Key exchange message</string>
     <string name="ConversationItem_received_and_processed_key_exchange_message">Received and processed key exchange message.</string>
     <string name="ConversationItem_error_received_stale_key_exchange_message">Error, received stale key exchange message.</string>
     <string name="ConversationItem_received_key_exchange_message_click_to_process">Received key exchange message, click to process</string>
@@ -93,7 +70,6 @@
 	<string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Are you sure that you want to permanently delete this message?</string>
     
     <!-- ConversationListAdapter -->
-    <string name="ConversationListAdapter_encrypted_message_enter_passphrase">"Encrypted message, enter passphrase... "</string>
     <string name="ConversationListAdapter_key_exchange_message">Key exchange message...</string>
     
     <!-- ConversationListFragment -->
@@ -188,17 +164,6 @@
     <string name="PromptApnActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">You can modify these values from the TextSecure settings menu at any time.</string>    
     
     <!-- ReceiveKeyActivity -->
-    <string name="ReceiveKeyActivity_error_you_have_received_a_corrupted_public_key">ERROR:\n\nYou have received a corrupted public key.  This key cannot be processed, please re-initiate a secure session.</string>
-    <string name="ReceiveKeyActivity_error_you_have_received_a_public_key_from_an_unsupported_version_of_the_protocol">ERROR:\n\nYou have received a public key from an unsupported version of the protocol.  This key cannot be processed, please re-initiate a secure session.</string>
-    <string name="ReceiveKeyActivity_this_key_exchange_message_does_not_include_an_identity_signature">This key exchange message does not include an identity signature.</string>
-    <string name="ReceiveKeyActivity_this_key_exchange_message_includes_an_identity_signature_but_you_do_not_yet_trust_it">This key exchange message includes an identity signature, but you do not yet trust it.</string>
-    <string name="ReceiveKeyActivity_this_key_exchange_message_includes_an_identity_signature_which_you_trust_for_s">This key exchange message includes an identity signature which you trust for: %s</string>
-    <string name="ReceiveKeyActivity_this_is_the_key_that_you_sent_to_start_your_current_encrypted_session_with_s">This is the key that you sent to start your current encrypted session with %s</string>
-    <string name="ReceiveKeyActivity_this_is_the_key_that_you_received_to_start_your_current_encrypted_session_with_s">This is the key that you received to start your current encrypted session with %s</string>
-    <string name="ReceiveKeyActivity_you_have_received_a_key_exchange_message_from_s_warning_you_already_have_an_encrypted_session">You have received a Key Exchange message from %s.\n\nWARNING:  You already have an encrypted session with this contact.  If you choose to accept this key exchange message, it will destroy your existing session and you will have to re-authenticate.  Would you like to complete this key exchange?</string>
-    <string name="ReceiveKeyActivity_you_have_received_a_key_exchange_message_from_s_you_have_previously_initiated">You have received a Key Exchange message from %s.  You have previously initiated a session with this contact, and by accepting this key you will complete the key exchange.  Would you like to complete this key exchange?</string>
-    <string name="ReceiveKeyActivity_you_have_initiated_a_key_exchange_message_with_s_but_have_not_yet_received_a_reply">You have initiated a Key Exchange message with %s but have not yet received a reply.</string>
-    <string name="ReceiveKeyActivity_you_have_received_a_key_exchange_message_from_s_you_have_no_existing_session">You have received a Key Exchange message from %s.  You have no existing session with this contact, would you like to complete this key exchange?</string>
     <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">The
         signature on this key exchange is different than what you\'ve previously received from this
         contact. This could either mean that someone is trying to intercept your communication, or
@@ -212,23 +177,7 @@
         exchanges\' setting disabled.
     </string>
 
-
-    <!-- ReviewIdentitiesActivity -->
-    <string name="ReviewIdentitiesActivity_unable_to_view_corrupted_identity_key_exclamation">Unable to view corrupted identity key!</string>
-    <string name="ReviewIdentitiesActivity_delete_identity">Delete identity?</string>
-    <string name="ReviewIdentitiesActivity_delete_identity_are_you_sure_you_want_to_delete_this_identity_key">Are you sure that you wish to permanently delete this identity key?</string>
-    <string name="ReviewIdentitiesActivity_invalid_identity">Invalid Identity!</string>
-    
-    <!-- SaveIdentityActivity -->
-    <string name="SaveIdentityActivity_you_must_specify_a_name_for_this_identity_exclamation">You must specify a name for this identity!</string>
-    <string name="SaveIdentityActivity_identity_name_exists_exclamation">Identity Name Exists!</string>
-    <string name="SaveIdentityActivity_an_identity_key_with_the_specified_name_already_exists">An identity key with the specified name already exists.</string>
-    <string name="SaveIdentityActivity_manage_identities">Manage Identities</string>
-    
     <!-- VerifyIdentityActivity -->
-    <string name="VerifyIdentityActivity_mark_identity_verified_question">Mark Identity Verified?</string>
-    <string name="VerifyIdentityActivity_are_you_sure_you_have_validated_the_recipients_identity_fingerprint_and_would_like_to_mark_it_as_verified">Are you sure you have validated the recipients\' identity fingerprint and would like to mark it as verified?</string>
-    <string name="VerifyIdentityActivity_mark_verified">Mark Verified</string>
     <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">You do not have an identity key.</string>
     <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Recipient has no identity key.</string>
     <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Recipient has no identity key!</string>
@@ -239,24 +188,8 @@
     <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Their key is correct. It is also necessary to verify your key with them as well.</string>
     <string name="VerifyIdentityActivity_verified_exclamation">Verified!</string>
     <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">You don\'t have an identity key!</string>
-    
-    <!-- VerifyImportedIdentityActivity -->
-    <string name="VerifyImportedIdentityActivity_you_must_specify_a_name_for_this_contact_exclamation">You must specify a name for this contact!</string>
-    <string name="VerifyImportedIdentityActivity_save_identity_key_question">Save Identity Key?</string>
-    <string name="VerifyImportedIdentityActivity_error_saving_identity_key_exclamation">Error saving identity key!</string>
-    <string name="VerifyImportedIdentityActivity_this_identity_key_or_an_identity_key_with_the_same_name_already_exists_please_edit_your_key_database">This identity key or an identity key with the same name already exists.  Please edit your key database.</string>
-    <string name="VerifyImportedIdentityActivity_scan_to_compare">Scan to compare</string>
-    <string name="VerifyImportedIdentityActivity_get_scanned_to_compare">Get scanned to compare</string>
-    <string name="VerifyImportedIdentityActivity_not_verified_exclamation">NOT Verified!</string>
-    <string name="VerifyImportedIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">WARNING, the scanned key DOES NOT match!</string>
-    <string name="VerifyImportedIdentityActivity_the_scanned_key_matches_exclamation">The scanned key matches!</string>
-    <string name="VerifyImportedIdentityActivity_verified_exclamation">Verified!</string>
-    <string name="VerifyImportedIdentityActivity_are_you_sure_that_you_would_like_to_mark_this_as_a_valid_identity_key_for_all_future_correspondence_with_s">Are you sure that you would like to mark this as a valid identity key for all future correspondence with %s?  You should only do this if you have actually verified the fingerprint.</string>
-    
+
     <!-- VerifyKeysActivity -->
-    <string name="VerifyKeysActivity_mark_session_verified_question">Mark Session Verified?</string>
-    <string name="VerifyKeysActivity_are_you_sure_that_you_have_validated_these_fingerprints_and_would_like_to_mark_this_session_as_verified">Are you sure that you have validated these fingerprints and would like to mark this session as verified?</string>
-    <string name="VerifyKeysActivity_mark_verified">Mark Verified</string>
     <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Get my fingerprint scanned</string>
     <string name="VerifyKeysActivity_scan_their_fingerprint">Scan their fingerprint</string>
     <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">WARNING, the scanned key DOES NOT match! Please check the fingerprint text carefully.</string>
@@ -283,15 +216,13 @@
     <string name="MessageDisplayHelper_bad_encrypted_message">Bad encrypted message...</string>
     <string name="MessageDisplayHelper_decrypting_please_wait">Decrypting, please wait...</string>
     <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Message encrypted for non-existing session...</string>
-    <string name="MessageDisplayHelper_decryption_error_local_message_corrupted_mac_doesn_t_match_potential_tampering_question">Decryption error: local message corrupted, MAC doesn\'t match. Potential tampering?</string>
-        
+
     <!-- MmsDatabase -->
     <string name="MmsDatabase_connecting_to_mms_server">Connecting to MMS server...</string>
     <string name="MmsDatabase_downloading_mms">Downloading MMS...</string>
     <string name="MmsDatabase_mms_download_failed">MMS Download failed!</string>
     <string name="MmsDatabase_downloading">Downloading...</string>
-    <string name="MmsDatabase_anonymous">Anonymous</string>
-    
+
     <!-- MmsMessageRecord -->
     <string name="MmsMessageRecord_decrypting_mms_please_wait">Decrypting MMS, please wait...</string>
     <string name="MmsMessageRecord_bad_encrypted_mms_message">Bad encrypted MMS message...</string>
@@ -311,9 +242,7 @@
     <!-- MessageNotifier -->
     <string name="MessageNotifier_d_new_messages">%d new messages</string>
     <string name="MessageNotifier_most_recent_from_s">Most recent from: %s</string>    
-    <string name="MessageNotifier_key_exchange">Key exchange...</string>
     <string name="MessageNotifier_encrypted_message">Encrypted message...</string>
-    <string name="MessageNotifier_corrupted_ciphertext">Corrupted ciphertext</string>
     <string name="MessageNotifier_no_subject">(No Subject)</string>
     <string name="MessageNotifier_message_delivery_failed">Message delivery failed.</string>
     <string name="MessageNotifier_failed_to_deliver_message">Failed to deliver message.</string>
@@ -409,8 +338,6 @@
     <string name="prompt_apn_activity__mms_proxy_port_optional">MMS PROXY PORT (OPTIONAL):</string>    
     
     <!-- receive_key_activity -->
-    <string name="receive_key_activity__session">Session</string>
-    <string name="receive_key_activity__identities">Identities</string>
     <string name="receive_key_activity__complete">Complete</string>
 
     <!-- recipients_panel -->
@@ -418,10 +345,7 @@
     
     <!-- review_identities -->
     <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">You don\'t currently have any identity keys in your trust database.</string>
-    
-    <!-- save_identity_activity -->
-    <string name="save_identity_activity__identity_name">Identity Name:</string>
-    
+
     <!-- verify_identity_activity -->
     <string name="verify_identity_activity__their_identity_they_read">Their identity (they read):</string>
     <string name="verify_identity_activity__your_identity_you_read">Your identity (you read):</string>
@@ -435,10 +359,6 @@
     <!-- verify_keys_activity -->
     <string name="verify_keys_activity__they_read_this">They read this:</string>
     <string name="verify_keys_activity__you_read_this">You read this:</string>
-    
-    <!-- view_identity_activity -->
-    <string name="view_identity_activity__identity">Identity:</string>
-    <string name="view_identity_activity__qr_code">QR Code</string>
 
     <!-- AndroidManifest.xml -->
     
@@ -450,10 +370,8 @@
     <string name="AndroidManifest__change_passphrase">Change Passphrase</string>
     <string name="AndroidManifest__verify_session">Verify Session</string>
     <string name="AndroidManifest__verify_identity">Verify Identity</string>
-    <string name="AndroidManifest__save_identity">Save Identity</string>
     <string name="AndroidManifest__manage_identity_keys">Manage Identity Keys</string>
     <string name="AndroidManifest__complete_key_exchange">Complete Key Exchange</string>
-    <string name="AndroidManifest__verify_imported_identity">Verify Imported Identity</string>
 
     <!-- arrays.xml -->
     <string name="arrays__import_export">Import / Export</string>
@@ -462,26 +380,19 @@
 
     <!-- preferences.xml -->
     <string name="preferences__general">General</string>
-    <string name="preferences__use_settings">Use Settings</string>
     <string name="preferences__pref_all_sms_title">Use for all SMS</string>
     <string name="preferences__pref_all_mms_title">Use for all MMS</string> 
     <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Use TextSecure for viewing and storing all incoming text messages</string>
     <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Use TextSecure for viewing and storing all incoming multimedia messages</string>
-    <string name="preferences__input_settings">Input Settings</string>
     <string name="preferences__pref_enter_sends_title">Enter sends</string>
     <string name="preferences__pressing_the_enter_key_will_send_text_messages">Pressing the enter key will send text messages</string>
     <string name="preferences__display_settings">Display Settings</string>
     <string name="preferences__choose_identity">Choose Identity</string>
     <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Choose your contact entry from the contacts list.</string>
-    <string name="preferences__encryption_settings">Encryption Settings</string>
     <string name="preferences__change_passphrase">Change passphrase</string>
     <string name="preferences__change_my_passphrase">Change my passphrase</string>
     <string name="preferences__complete_key_exchanges">Complete key exchanges</string>
     <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Automatically complete key exchanges for new sessions or for existing sessions with the same identity key</string>
-    <string name="preferences__include_a_whitespace_tag_at_the_end_of_every_non_encrypted_message">Include a whitespace tag at the end of every non-encrypted message</string>
-    <string name="preferences__include_whitespace_tag">Include whitespace tag</string>
-    <string name="preferences__sign_key_exchange_messages_with_identity_key">Sign key exchange messages with identity key</string>
-    <string name="preferences__sign_key_exchange">Sign Key Exchange</string>
     <string name="preferences__forget_passphrase_from_memory_after_some_interval">Forget passphrase from memory after some interval</string>
     <string name="preferences__timeout_passphrase">Timeout passphrase</string>
     <string name="preferences__pref_timeout_interval_dialogtitle">Select Passphrase Timeout</string>
@@ -489,12 +400,8 @@
     <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">The amount of time to wait before forgetting passphrase from memory</string>
     <string name="preferences__identity_key_settings">Identity keys</string>
     <string name="preferences__view_my_identity_key">View my identity key</string>
-    <string name="preferences__export_my_identity_key">Export my identity key</string>
-    <string name="preferences__import_contacts_key">Import contact\'s key</string>
-    <string name="preferences__import_an_identity_key_from_a_contact">Import an identity key from a contact</string>
     <string name="preferences__manage_identity_keys">Manage identity keys</string>
     <string name="preferences__manage_configured_identity_keys">Manage configured identity keys</string>
-    <string name="preferences__notification_settings">Notification Settings</string>
     <string name="preferences__notifications">Notifications</string>
     <string name="preferences__display_message_notifications_in_status_bar">Display message notifications in status bar</string>
     <string name="preferences__led_color">LED Color</string>
@@ -526,10 +433,7 @@
     <string name="preferences__mmsc_url_required">MMSC URL (Required)</string>
     <string name="preferences__mms_proxy_host_optional">MMS Proxy Host (Optional)</string>
     <string name="preferences__mms_proxy_port_optional">MMS Proxy Port (Optional)</string>
-    <string name="preferences__delivery_reports">Delivery Reports</string>
     <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Request a delivery report for each SMS message you send</string>
-    <string name="preferences__request_a_delivery_report_for_each_mms_message_you_send">Request a delivery report for each MMS message you send</string>
-    <string name="preferences__mms_delivery_reports">MMS delivery reports</string>
     <string name="preferences__sms_delivery_reports">SMS delivery reports</string>
     <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automatically delete older messages once a conversation thread exceeds a specified length</string>
     <string name="preferences__delete_old_messages">Delete old messages</string>
@@ -602,9 +506,6 @@
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_message">New Message</string>
     <string name="text_secure_normal__menu_settings">Settings</string>
-    <string name="text_secure_normal__menu_import_export">Import/Export</string>
-    <string name="text_secure_normal__menu_import">Import</string>
-    <string name="text_secure_normal__menu_export">Export</string>
     <string name="text_secure_normal__menu_clear_passphrase">Clear Passphrase</string>
     <string name="text_secure_normal__mark_all_as_read">Mark All Read</string>