diff --git a/res/values/strings.xml b/res/values/strings.xml
index 89a3d8776..f3438c5f4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7,13 +7,11 @@
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferencesActivity_currently_s">Currently: %s</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>
     <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Delete all old messages now?</string>
     <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Are you sure you would like to immediately trim all conversation threads to the %s most recent messages?</string>
     <string name="ApplicationPreferencesActivity_delete">Delete</string>
-    <string name="ApplicationPreferencesActivity_my">My</string>
     <string name="ApplicationPreferencesActivity_disable_storage_encryption">Disable storage encryption?</string>
     <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
         Warning, this will disable storage encryption for all messages and keys. Your encrypted
@@ -29,9 +27,6 @@
         You will need to re-register your phone number to use push messages again in the future.
     </string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Error connecting to server!</string>
-    <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">You are not registered with the push service...</string>
-    <string name="ApplicationPreferencesActivity_updating_directory">Updating directory</string>
-    <string name="ApplicationPreferencesActivity_updating_push_directory">Updating push directory...</string>
     <string name="ApplicationPreferencesActivity_sms_enabled">Incoming SMS Enabled</string>
     <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Touch to change your default SMS app</string>
     <string name="ApplicationPreferencesActivity_sms_disabled">Incoming SMS Disabled</string>
@@ -41,7 +36,6 @@
     <string name="AttachmentManager_cant_open_media_selection">Can\'t find an app to select media.</string>
 
     <!-- AttachmentTypeSelectorAdapter -->
-
     <string name="AttachmentTypeSelectorAdapter_picture">Picture</string>
     <string name="AttachmentTypeSelectorAdapter_video">Video</string>
     <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
@@ -52,13 +46,9 @@
     <string name="ConversationItem_error_sending_message">Error sending message</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_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>
-    <string name="ConversationItem_received_plaintext_message_click_to_terminate">Received a plaintext SMS while you have a secure session open. If they don\'t have a session open, messages you send will appear as garbled text. Click to terminate secure session.</string>
     <string name="ConversationItem_group_action_left">%1$s has left the group.</string>
-    <string name="ConversationItem_group_action_joined">%1$s have joined the group.</string>
-    <string name="ConversationItem_group_action_modify">%1$s has updated the group.</string>
     <string name="ConversationItem_click_to_approve_sms">Tap for SMS fallback</string>
     <string name="ConversationItem_click_to_approve_mms">Tap for MMS fallback</string>
     <string name="ConversationItem_click_to_approve_unencrypted">Tap for insecure fallback</string>
@@ -110,9 +100,6 @@
     <string name="ConversationFragment_saving_attachment">Saving attachment</string>
     <string name="ConversationFragment_saving_attachment_to_sd_card">Saving attachment to storage...</string>
 
-    <!-- ConversationListAdapter -->
-    <string name="ConversationListAdapter_key_exchange_message">Key exchange message...</string>
-
     <!-- ConversationListFragment -->
     <string name="ConversationListFragment_delete_threads_question">Delete threads?</string>
     <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Are you sure you wish to delete ALL selected conversation threads?</string>
@@ -126,10 +113,6 @@
     <string name="ShareActivity_share_with">Share with</string>
 
     <!-- ExportFragment -->
-    <string name="ExportFragment_export_to_sd_card">Export to SD card?</string>
-    <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">This
-        will export your encrypted keys, settings, and messages to the SD card.
-    </string>
     <string name="ExportFragment_export">Export</string>
     <string name="ExportFragment_export_plaintext_to_sd_card">Export plaintext to SD card?</string>
     <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Warning, this will
@@ -145,9 +128,6 @@
     <string name="ExportFragment_error_while_writing_to_sd_card">Error while writing to SD card.
     </string>
     <string name="ExportFragment_success">Success!</string>
-    <string name="ExportFragment_exporting_keys_settings_and_messages">Exporting encrypted keys,
-        settings, and messages...
-    </string>
 
     <!-- GcmRefreshJob -->
     <string name="GcmRefreshJob_Permanent_TextSecure_communication_failure">Permanent TextSecure communication failure!</string>
@@ -163,7 +143,6 @@
     <string name="GroupCreateActivity_contacts_mms_exception">An unexpected error happened that has made group creation fail.</string>
     <string name="GroupCreateActivity_contacts_no_members">You need at least one person in your group!</string>
     <string name="GroupCreateActivity_contacts_invalid_number">One of the members of your group has a number that can\'t be read correctly. Please fix or remove that contact and try again.</string>
-    <string name="GroupCreateActivity_file_io_exception">File I/O error, couldn\'t create a temporary image file.</string>
     <string name="GroupCreateActivity_avatar_content_description">Group avatar</string>
     <string name="GroupCreateActivity_menu_create_title">Create group</string>
     <string name="GroupCreateActivity_creating_group">Creating %1$s&#8230;</string>
@@ -210,7 +189,6 @@
     <string name="KeyScanningActivity_no_scanned_key_found_exclamation">No scanned key found!</string>
 
     <!-- MmsDownloader -->
-    <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">No connectivity available for MMS download, try again later...</string>
     <string name="MmsDownloader_error_storing_mms">Error storing MMS!</string>
     <string name="MmsDownloader_error_connecting_to_mms_provider">Error connecting to MMS provider...</string>
     <string name="MmsDownloader_error_reading_mms_settings">Error reading wireless provider MMS settings...</string>
@@ -231,11 +209,6 @@
     <string name="PassphrasePromptActivity_ok_button_content_description">Submit passphrase</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Invalid passphrase!</string>
 
-    <!-- PromptMmsActivity -->
-    <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">You must specify an MMSC URL for your carrier.</string>
-    <string name="PromptMmsActivity_mms_settings_updated">MMS settings updated</string>
-    <string name="PromptMmsActivity_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_the_signature_on_this_key_exchange_is_different">The
         signature on this key exchange is different than what you\'ve previously received from this
@@ -285,7 +258,6 @@
     <string name="RegistrationProgressActivity_verifying_number">Verifying number</string>
     <string name="RegistrationProgressActivity_edit_s">Edit %s</string>
     <string name="RegistrationProgressActivity_registration_complete">Registration complete!</string>
-    <string name="RegistrationProgressActivity_possible_problems">Possible problems.</string>
     <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">You must enter the code you received first...</string>
     <string name="RegistrationProgressActivity_connecting">Connecting</string>
     <string name="RegistrationProgressActivity_connecting_for_verification">Connecting for verification...</string>
@@ -301,7 +273,6 @@
     <string name="RegistrationProgressActivity_the_server_encountered_an_error">The server encountered an error. Please try again.</string>
     <string name="RegistrationProgressActivity_too_many_requests">Too many requests!</string>
     <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">You\'ve already recently requested a voice call. You can request another in 20 minutes.</string>
-    <string name="RegistrationProgressActivity_verifying_voice_code">Verifying voice code...</string>
     <string name="RegistrationProgressActivity_registration_conflict">Registration conflict</string>
     <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">This number is already registered on a different TextSecure server (CyanogenMod?). You must unregister there before registering here.</string>
 
@@ -341,14 +312,6 @@
     <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>
 
-    <!-- VerifyKeysActivity -->
-    <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>
-    <string name="VerifyKeysActivity_not_verified_exclamation">NOT verified!</string>
-    <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Their key is correct. It is also necessary to get your fingerprint scanned as well.</string>
-    <string name="VerifyKeysActivity_verified_exclamation">Verified!</string>
-
     <!-- ViewIdentityActivity -->
     <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">You do not have an identity key.</string>
     <string name="ViewIdentityActivity_scan_to_compare">Scan to compare</string>
@@ -357,7 +320,6 @@
     <string name="ViewIdentityActivity_not_verified_exclamation">NOT verified!</string>
     <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">The scanned key matches!</string>
     <string name="ViewIdentityActivity_verified_exclamation">Verified!</string>
-    <string name="ViewIdentityActivity_identity_fingerprint">Identity fingerprint</string>
     <string name="ViewIdentityActivity_my_identity_fingerprint">My identity fingerprint</string>
 
     <!-- KeyExchangeInitiator -->
@@ -382,9 +344,6 @@
     <string name="MmsMessageRecord_bad_encrypted_mms_message">Bad encrypted MMS message...</string>
     <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS message encrypted for non-existing session...</string>
 
-    <!-- MmsSender -->
-    <string name="MmsSender_currently_unable_to_send_your_mms_message">Currently unable to send your MMS message.</string>
-
     <!-- ApplicationMigrationService -->
     <string name="ApplicationMigrationService_import_in_progress">Import in progress</string>
     <string name="ApplicationMigrationService_importing_text_messages">Importing text messages</string>
@@ -406,24 +365,6 @@
     <string name="MessageNotifier_mark_all_as_read">Mark all as read</string>
     <string name="MessageNotifier_mark_as_read">Mark as read</string>
 
-    <!-- ViewLocalIdentityActivity -->
-    <string name="ViewLocalIdentityActivity_regenerating">Regenerating...</string>
-    <string name="ViewLocalIdentityActivity_regenerating_identity_key">Regenerating identity
-        key...
-    </string>
-    <string name="ViewLocalIdentityActivity_regenerated">Regenerated!</string>
-    <string name="ViewLocalIdentityActivity_reset_identity_key">Reset identity key?</string>
-    <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
-        Caution! By regenerating your identity key, your current identity key will be permanently lost,
-        and your existing contacts will receive warnings when establishing new secure sessions with you.
-        Are you sure you would like to continue?
-    </string>
-    <string name="ViewLocalIdentityActivity_cancel">Cancel</string>
-    <string name="ViewLocalIdentityActivity_continue">Continue</string>
-
-    <!-- SmsReceiver -->
-    <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Currently unable to send your SMS message. It will be sent once service becomes available.</string>
-
     <!-- QuickResponseService -->
     <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Sorry, Quick Response is not yet supported by TextSecure!</string>
 
@@ -442,7 +383,6 @@
     <string name="contact_selection_group_activity__finding_contacts">Loading contacts&#8230;</string>
 
     <!-- single_contact_selection_activity -->
-    <string name="single_contact_selection_group_activity__filter">Type a name to filter&#8230;</string>
     <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">You are not registered with the push service&#8230;</string>
     <string name="SingleContactSelectionActivity_updating_directory">Updating directory</string>
     <string name="SingleContactSelectionActivity_updating_push_directory">Updating push directory&#8230;</string>
@@ -491,16 +431,6 @@
     <string name="country_selection_fragment__loading_countries">Loading countries...</string>
     <string name="country_selection_fragment__search">Search</string>
 
-    <!-- create_passphrase_activity -->
-    <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Please choose a passphrase if you would like to locally encrypt your data.</string>
-    <string name="create_passphrase_activity__passphrase">PASSPHRASE:</string>
-    <string name="create_passphrase_activity__repeat">REPEAT:</string>
-    <string name="create_passphrase_activity__continue">Continue</string>
-    <string name="create_passphrase_activity__generating_secrets">GENERATING SECRETS</string>
-    <string name="create_passphrase_activity__skip">Skip</string>
-    <string name="create_passphrase_activity__create">Create</string>
-
-
     <!-- log_submit_activity -->
     <string name="log_submit_activity__log_fetch_failed">Could not grab logs from your device. You can still use ADB to get debug logs instead.</string>
     <string name="log_submit_activity__thanks">Thanks for your help!</string>
@@ -518,10 +448,6 @@
     <!-- database_upgrade_activity -->
     <string name="database_upgrade_activity__updating_database">Updating database...</string>
 
-    <string name="export_fragment__export_encrypted_backup">Export encrypted backup</string>
-    <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Export an encrypted
-        backup to the SD card.
-    </string>
     <string name="export_fragment__export_plaintext_backup">Export plaintext backup</string>
     <string name="export_fragment__export_a_plaintext_backup_compatible_with">
         Export a plaintext backup compatible with \'SMSBackup And Restore\' to the SD card.</string>
@@ -537,21 +463,15 @@
     <string name="import_fragment__import_a_plaintext_backup_file">
         Import a plaintext backup file. Compatible with \'SMSBackup And Restore.\'</string>
 
-    <string name="local_identity__regenerate_key">Regenerate key</string>
-
     <!-- mms_preferences_activity -->
     <string name="mms_preferences_activity__manual_mms_settings_are_required">Manual MMS settings are required for your phone.</string>
 
     <!-- prompt_passphrase_activity -->
-    <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE PASSPHRASE</string>
     <string name="prompt_passphrase_activity__unlock">Unlock</string>
 
     <!-- prompt_mms_activity -->
     <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure requires MMS settings to deliver media and group messages through your wireless carrier. Your device does not make this information available, which is occasionally true for locked devices and other restrictive configurations.</string>
     <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">To send media and group messages, click \'OK\' and complete the requested settings. The MMS settings for your carrier can generally be located by searching for \'your carrier APN\'. You will only need to do this once.</string>
-    <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (REQUIRED):</string>
-    <string name="prompt_mms_activity__mms_proxy_host_optional">MMS PROXY HOST (OPTIONAL):</string>
-    <string name="prompt_mms_activity__mms_proxy_port_optional">MMS PROXY PORT (OPTIONAL):</string>
 
     <!-- receive_key_activity -->
     <string name="receive_key_activity__complete">Complete</string>
@@ -642,34 +562,18 @@
     <string name="recipients_panel__to"><small>Enter a name or number</small></string>
     <string name="recipients_panel__add_member">Add member</string>
 
-    <!-- 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>
-
     <!-- 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>
 
-    <!-- verify_import_identity_activity -->
-    <string name="verify_import_identity_activity__identity_name_n">Identity name:\\n</string>
-    <string name="verify_import_identity_activity__imported_identity_n">Imported identity:\\n</string>
-    <string name="verify_import_identity_activity__verified">Verified!</string>
-    <string name="verify_import_identity_activity__compare">Compare</string>
-
-    <!-- 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>
-
     <!-- AndroidManifest.xml -->
     <string name="AndroidManifest__create_passphrase">Create passphrase</string>
     <string name="AndroidManifest__enter_passphrase">Enter passphrase</string>
     <string name="AndroidManifest__select_contacts">Select contacts</string>
-    <string name="AndroidManifest__select_contact">Select contact</string>
     <string name="AndroidManifest__textsecure_detected">TextSecure detected</string>
     <string name="AndroidManifest__public_identity_key">Public identity key</string>
     <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__manage_identity_keys">Manage identity keys</string>
     <string name="AndroidManifest__complete_key_exchange">Complete key exchange</string>
     <string name="AndroidManifest__log_submit">Submit debug logs</string>
     <string name="AndroidManifest__media_preview">Media Preview</string>
@@ -679,7 +583,6 @@
     <string name="arrays__my_identity_key">My identity key</string>
 
     <!-- preferences.xml -->
-    <string name="preferences__general">General</string>
     <string name="preferences__push_sms_category">Push and SMS</string>
     <string name="preferences__pref_all_sms_title">Receive all SMS</string>
     <string name="preferences__pref_all_mms_title">Receive all MMS</string>
@@ -706,10 +609,6 @@
     <string name="preferences__pref_timeout_interval_dialogtitle">Select passphrase timeout</string>
     <string name="preferences__pref_timeout_interval_title">Timeout interval</string>
     <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__manage_identity_keys">Manage identity keys</string>
-    <string name="preferences__manage_configured_identity_keys">Manage configured identity keys</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>
@@ -767,8 +666,6 @@
         Increase privacy and avoid SMS fees by using the data channel for communication with other TextSecure users
     </string>
     <string name="preferences__allow_sms_fallback">Allow outgoing SMS to</string>
-    <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure is currently your default SMS app. Please set another default SMS app first to change this preference.</string>
-    <string name="preferences__refresh_push_directory">Refresh push directory</string>
     <string name="preferences__submit_debug_log">Submit debug log</string>
     <string name="preferences__sms_outgoing_push_users">TextSecure users</string>
     <string name="preferences__sms_fallback_push_users_ask">(ask first)</string>
@@ -823,12 +720,9 @@
 
     <!-- conversation_list -->
     <string name="conversation_list__menu_search">Search</string>
-    <string name="conversation_list__drawer_open">Open navigation drawer</string>
-    <string name="conversation_list__drawer_close">Close navigation drawer</string>
 
     <!-- conversation_secure_verified -->
     <string name="conversation_secure_verified__menu_security">Security</string>
-    <string name="conversation_secure_verified__menu_no_identity">No identity available</string>
     <string name="conversation_secure_verified__menu_verify_identity">Verify identity</string>
     <string name="conversation_secure_verified__menu_abort_secure_session">End secure session</string>
 
@@ -850,9 +744,6 @@
     <string name="key_scanning__menu_get_scanned_to_compare">Get scanned to compare</string>
     <string name="key_scanning__menu_scan_to_compare">Scan to compare</string>
 
-    <!-- text_secure_locked -->
-    <string name="text_secure_locked__menu_unlock">Unlock</string>
-
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_message">New message</string>
     <string name="text_secure_normal__menu_new_group">New group</string>
@@ -860,9 +751,6 @@
     <string name="text_secure_normal__menu_clear_passphrase">Lock</string>
     <string name="text_secure_normal__mark_all_as_read">Mark all read</string>
 
-    <!-- verify_keys -->
-    <string name="verify_keys__menu_verified">Verified</string>
-
     <!-- reminder_header -->
     <string name="reminder_header_sms_default_title">Use as default SMS app?</string>
     <string name="reminder_header_sms_default_text">TextSecure is not currently your default SMS app.</string>