diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 128e448b6..0745865a4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -130,14 +130,6 @@
             android:value="org.thoughtcrime.securesms.ConversationListActivity" />
     </activity>
 
-    <activity android:name=".PromptMmsActivity"
-              android:label="Configure MMS Settings"
-              android:windowSoftInputMode="stateUnchanged"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".preferences.MmsPreferencesActivity"
-               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
     <activity android:name=".ShareActivity"
               android:theme="@style/TextSecure.LightNoActionBar"
               android:excludeFromRecents="true"
diff --git a/res/layout/prompt_apn_activity.xml b/res/layout/prompt_apn_activity.xml
deleted file mode 100644
index 5590f7642..000000000
--- a/res/layout/prompt_apn_activity.xml
+++ /dev/null
@@ -1,58 +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:orientation="vertical">
-    
-            <TextView style="@style/Registration.Description"
-                      android:layout_width="fill_parent"
-                      android:layout_height="wrap_content"
-                      android:layout_marginBottom="16dip"
-                      android:text="@string/prompt_mms_activity__signal_requires_mms_settings_to_deliver_media_and_group_messages"/>
-                    
-            <TextView style="@style/Registration.Description"
-                      android:layout_width="fill_parent"
-                      android:layout_height="wrap_content"
-                      android:layout_marginBottom="16dip"
-                      android:text="@string/prompt_mms_activity__to_send_media_and_group_messages_tap_ok"/>
-                        
-            <LinearLayout android:orientation="horizontal"
-                          android:gravity="center"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content"
-                          android:layout_marginTop="10dip"
-                          android:layout_marginBottom="20dip">
-
-                <Button android:id="@+id/cancel_button"
-                        android:text="@android:string/cancel"
-                        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/ok_button"
-                        android:text="@android:string/ok"
-                        android:layout_weight="1"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:textAppearance="?android:attr/textAppearanceMedium"/>                
-            </LinearLayout>
-        </LinearLayout>    
-    </FrameLayout>
-</ScrollView>
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 1c90c4766..74f959b6b 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -865,23 +865,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void handleAddAttachment() {
-    if (this.isMmsEnabled || isSecureText) {
-      if (attachmentTypeSelector == null) {
-        attachmentTypeSelector = new AttachmentTypeSelector(this, getSupportLoaderManager(), new AttachmentTypeListener());
-      }
-      attachmentTypeSelector.show(this, attachButton);
-    } else {
-      handleManualMmsRequired();
+    if (attachmentTypeSelector == null) {
+      attachmentTypeSelector = new AttachmentTypeSelector(this, getSupportLoaderManager(), new AttachmentTypeListener());
     }
-  }
-
-  private void handleManualMmsRequired() {
-    Toast.makeText(this, R.string.MmsDownloader_error_reading_mms_settings, Toast.LENGTH_LONG).show();
-
-    Bundle extras = getIntent().getExtras();
-    Intent intent = new Intent(this, PromptMmsActivity.class);
-    if (extras != null) intent.putExtras(extras);
-    startActivity(intent);
+    attachmentTypeSelector.show(this, attachButton);
   }
 
   private void handleSecurityChange(boolean isSecureText, boolean isDefaultSms) {
@@ -1462,9 +1449,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       Log.w(TAG, "isManual Selection: " + sendButton.isManualSelection());
       Log.w(TAG, "forceSms: " + forceSms);
 
-      if ((recipient.isMmsGroupRecipient() || recipient.getAddress().isEmail()) && !isMmsEnabled) {
-        handleManualMmsRequired();
-      } else if (attachmentManager.isAttachmentPresent() || recipient.isGroupRecipient() || recipient.getAddress().isEmail() || inputPanel.getQuote().isPresent()) {
+      if (attachmentManager.isAttachmentPresent() || recipient.isGroupRecipient() || recipient.getAddress().isEmail() || inputPanel.getQuote().isPresent()) {
         sendMediaMessage(forceSms, expiresIn, subscriptionId, initiating);
       } else {
         sendTextMessage(forceSms, expiresIn, subscriptionId, initiating);
diff --git a/src/org/thoughtcrime/securesms/PromptMmsActivity.java b/src/org/thoughtcrime/securesms/PromptMmsActivity.java
deleted file mode 100644
index e2e4f6e96..000000000
--- a/src/org/thoughtcrime/securesms/PromptMmsActivity.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.widget.Button;
-
-import org.thoughtcrime.securesms.preferences.MmsPreferencesActivity;
-
-public class PromptMmsActivity extends PassphraseRequiredActionBarActivity {
-
-  @Override
-  protected void onCreate(Bundle bundle, boolean ready) {
-    setContentView(R.layout.prompt_apn_activity);
-    initializeResources();
-  }
-
-  private void initializeResources() {
-    Button okButton = findViewById(R.id.ok_button);
-    Button cancelButton = findViewById(R.id.cancel_button);
-
-    okButton.setOnClickListener(v -> {
-      Intent intent = new Intent(PromptMmsActivity.this, MmsPreferencesActivity.class);
-      intent.putExtras(PromptMmsActivity.this.getIntent().getExtras());
-      startActivity(intent);
-      finish();
-    });
-
-    cancelButton.setOnClickListener(v -> finish());
-  }
-
-}
diff --git a/src/org/thoughtcrime/securesms/backup/FullBackupImporter.java b/src/org/thoughtcrime/securesms/backup/FullBackupImporter.java
deleted file mode 100644
index 29b2f2cee..000000000
--- a/src/org/thoughtcrime/securesms/backup/FullBackupImporter.java
+++ /dev/null
@@ -1,328 +0,0 @@
-package org.thoughtcrime.securesms.backup;
-
-
-import android.annotation.SuppressLint;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.database.Cursor;
-import android.support.annotation.NonNull;
-import android.util.Log;
-import android.util.Pair;
-
-import net.sqlcipher.database.SQLiteDatabase;
-
-import org.greenrobot.eventbus.EventBus;
-import org.thoughtcrime.securesms.attachments.AttachmentId;
-import org.thoughtcrime.securesms.backup.BackupProtos.Attachment;
-import org.thoughtcrime.securesms.backup.BackupProtos.BackupFrame;
-import org.thoughtcrime.securesms.backup.BackupProtos.DatabaseVersion;
-import org.thoughtcrime.securesms.backup.BackupProtos.SharedPreference;
-import org.thoughtcrime.securesms.backup.BackupProtos.SqlStatement;
-import org.thoughtcrime.securesms.crypto.AttachmentSecret;
-import org.thoughtcrime.securesms.crypto.ModernEncryptingPartOutputStream;
-import org.thoughtcrime.securesms.database.Address;
-import org.thoughtcrime.securesms.database.AttachmentDatabase;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.database.GroupReceiptDatabase;
-import org.thoughtcrime.securesms.database.MmsDatabase;
-import org.thoughtcrime.securesms.database.MmsSmsColumns;
-import org.thoughtcrime.securesms.database.SearchDatabase;
-import org.thoughtcrime.securesms.database.ThreadDatabase;
-import org.thoughtcrime.securesms.profiles.AvatarHelper;
-import org.thoughtcrime.securesms.util.Conversions;
-import org.thoughtcrime.securesms.util.Util;
-import org.whispersystems.libsignal.kdf.HKDFv3;
-import org.whispersystems.libsignal.util.ByteUtil;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.Mac;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-public class FullBackupImporter extends FullBackupBase {
-
-  @SuppressWarnings("unused")
-  private static final String TAG = FullBackupImporter.class.getSimpleName();
-
-  public static void importFile(@NonNull Context context, @NonNull AttachmentSecret attachmentSecret,
-                                @NonNull SQLiteDatabase db, @NonNull File file, @NonNull String passphrase)
-      throws IOException
-  {
-    BackupRecordInputStream inputStream = new BackupRecordInputStream(file, passphrase);
-    int                     count       = 0;
-
-    try {
-      db.beginTransaction();
-
-      dropAllTables(db);
-
-      BackupFrame frame;
-
-      while (!(frame = inputStream.readFrame()).getEnd()) {
-        if (count++ % 100 == 0) EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, count));
-
-        if      (frame.hasVersion())    processVersion(db, frame.getVersion());
-        else if (frame.hasStatement())  processStatement(db, frame.getStatement());
-        else if (frame.hasPreference()) processPreference(context, frame.getPreference());
-        else if (frame.hasAttachment()) processAttachment(context, attachmentSecret, db, frame.getAttachment(), inputStream);
-        else if (frame.hasAvatar())     processAvatar(context, frame.getAvatar(), inputStream);
-      }
-
-      trimEntriesForExpiredMessages(context, db);
-
-      db.setTransactionSuccessful();
-    } finally {
-      db.endTransaction();
-    }
-
-    EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.FINISHED, count));
-  }
-
-  private static void processVersion(@NonNull SQLiteDatabase db, DatabaseVersion version) {
-    db.setVersion(version.getVersion());
-  }
-
-  private static void processStatement(@NonNull SQLiteDatabase db, SqlStatement statement) {
-    boolean isForSmsFtsSecretTable = statement.getStatement().contains(SearchDatabase.SMS_FTS_TABLE_NAME + "_");
-    boolean isForMmsFtsSecretTable = statement.getStatement().contains(SearchDatabase.MMS_FTS_TABLE_NAME + "_");
-
-    if (isForSmsFtsSecretTable || isForMmsFtsSecretTable) {
-      Log.i(TAG, "Ignoring import for statement: " + statement.getStatement());
-      return;
-    }
-
-    List<Object> parameters = new LinkedList<>();
-
-    for (SqlStatement.SqlParameter parameter : statement.getParametersList()) {
-      if      (parameter.hasStringParamter())   parameters.add(parameter.getStringParamter());
-      else if (parameter.hasDoubleParameter())  parameters.add(parameter.getDoubleParameter());
-      else if (parameter.hasIntegerParameter()) parameters.add(parameter.getIntegerParameter());
-      else if (parameter.hasBlobParameter())    parameters.add(parameter.getBlobParameter().toByteArray());
-      else if (parameter.hasNullparameter())    parameters.add(null);
-    }
-
-    if (parameters.size() > 0) db.execSQL(statement.getStatement(), parameters.toArray());
-    else                       db.execSQL(statement.getStatement());
-  }
-
-  private static void processAttachment(@NonNull Context context, @NonNull AttachmentSecret attachmentSecret, @NonNull SQLiteDatabase db, @NonNull Attachment attachment, BackupRecordInputStream inputStream)
-      throws IOException
-  {
-    File partsDirectory = context.getDir(AttachmentDatabase.DIRECTORY, Context.MODE_PRIVATE);
-    File dataFile       = File.createTempFile("part", ".mms", partsDirectory);
-
-    Pair<byte[], OutputStream> output = ModernEncryptingPartOutputStream.createFor(attachmentSecret, dataFile, false);
-
-    inputStream.readAttachmentTo(output.second, attachment.getLength());
-
-    ContentValues contentValues = new ContentValues();
-    contentValues.put(AttachmentDatabase.DATA, dataFile.getAbsolutePath());
-    contentValues.put(AttachmentDatabase.THUMBNAIL, (String)null);
-    contentValues.put(AttachmentDatabase.DATA_RANDOM, output.first);
-
-    db.update(AttachmentDatabase.TABLE_NAME, contentValues,
-              AttachmentDatabase.ROW_ID + " = ? AND " + AttachmentDatabase.UNIQUE_ID + " = ?",
-              new String[] {String.valueOf(attachment.getRowId()), String.valueOf(attachment.getAttachmentId())});
-  }
-
-  private static void processAvatar(@NonNull Context context, @NonNull BackupProtos.Avatar avatar, @NonNull BackupRecordInputStream inputStream) throws IOException {
-    inputStream.readAttachmentTo(new FileOutputStream(AvatarHelper.getAvatarFile(context, Address.fromExternal(context, avatar.getName()))), avatar.getLength());
-  }
-
-  @SuppressLint("ApplySharedPref")
-  private static void processPreference(@NonNull Context context, SharedPreference preference) {
-    SharedPreferences preferences = context.getSharedPreferences(preference.getFile(), 0);
-    preferences.edit().putString(preference.getKey(), preference.getValue()).commit();
-  }
-
-  private static void dropAllTables(@NonNull SQLiteDatabase db) {
-    try (Cursor cursor = db.rawQuery("SELECT name, type FROM sqlite_master", null)) {
-      while (cursor != null && cursor.moveToNext()) {
-        String name = cursor.getString(0);
-        String type = cursor.getString(1);
-
-        if ("table".equals(type)) {
-          db.execSQL("DROP TABLE IF EXISTS " + name);
-        }
-      }
-    }
-  }
-
-  private static void trimEntriesForExpiredMessages(@NonNull Context context, @NonNull SQLiteDatabase db) {
-    String trimmedCondition = " NOT IN (SELECT " + MmsDatabase.ID + " FROM " + MmsDatabase.TABLE_NAME + ")";
-
-    db.delete(GroupReceiptDatabase.TABLE_NAME, GroupReceiptDatabase.MMS_ID + trimmedCondition, null);
-
-    String[] columns = new String[] { AttachmentDatabase.ROW_ID, AttachmentDatabase.UNIQUE_ID };
-    String   where   = AttachmentDatabase.MMS_ID + trimmedCondition;
-
-    try (Cursor cursor = db.query(AttachmentDatabase.TABLE_NAME, columns, where, null, null, null, null)) {
-      while (cursor != null && cursor.moveToNext()) {
-        DatabaseFactory.getAttachmentDatabase(context).deleteAttachment(new AttachmentId(cursor.getLong(0), cursor.getLong(1)));
-      }
-    }
-
-    try (Cursor cursor = db.query(ThreadDatabase.TABLE_NAME, new String[] { ThreadDatabase.ID }, ThreadDatabase.EXPIRES_IN + " > 0", null, null, null, null)) {
-      while (cursor != null && cursor.moveToNext()) {
-        DatabaseFactory.getThreadDatabase(context).update(cursor.getLong(0), false);
-      }
-    }
-  }
-
-  private static class BackupRecordInputStream extends BackupStream {
-
-    private final InputStream in;
-    private final Cipher      cipher;
-    private final Mac         mac;
-
-    private final byte[] cipherKey;
-    private final byte[] macKey;
-
-    private byte[] iv;
-    private int    counter;
-
-    private BackupRecordInputStream(@NonNull File file, @NonNull String passphrase) throws IOException {
-      try {
-        this.in     = new FileInputStream(file);
-
-        byte[] headerLengthBytes = new byte[4];
-        Util.readFully(in, headerLengthBytes);
-
-        int headerLength = Conversions.byteArrayToInt(headerLengthBytes);
-        byte[] headerFrame = new byte[headerLength];
-        Util.readFully(in, headerFrame);
-
-        BackupFrame frame = BackupFrame.parseFrom(headerFrame);
-
-        if (!frame.hasHeader()) {
-          throw new IOException("Backup stream does not start with header!");
-        }
-
-        BackupProtos.Header header = frame.getHeader();
-
-        this.iv = header.getIv().toByteArray();
-
-        if (iv.length != 16) {
-          throw new IOException("Invalid IV length!");
-        }
-
-        byte[]   key     = getBackupKey(passphrase, header.hasSalt() ? header.getSalt().toByteArray() : null);
-        byte[]   derived = new HKDFv3().deriveSecrets(key, "Backup Export".getBytes(), 64);
-        byte[][] split   = ByteUtil.split(derived, 32, 32);
-
-        this.cipherKey = split[0];
-        this.macKey    = split[1];
-
-        this.cipher = Cipher.getInstance("AES/CTR/NoPadding");
-        this.mac    = Mac.getInstance("HmacSHA256");
-        this.mac.init(new SecretKeySpec(macKey, "HmacSHA256"));
-
-        this.counter = Conversions.byteArrayToInt(iv);
-      } catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException e) {
-        throw new AssertionError(e);
-      }
-    }
-
-    BackupFrame readFrame() throws IOException {
-      return readFrame(in);
-    }
-
-    void readAttachmentTo(OutputStream out, int length) throws IOException {
-      try {
-        Conversions.intToByteArray(iv, 0, counter++);
-        cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(cipherKey, "AES"), new IvParameterSpec(iv));
-        mac.update(iv);
-
-        byte[] buffer = new byte[8192];
-
-        while (length > 0) {
-          int read = in.read(buffer, 0, Math.min(buffer.length, length));
-          if (read == -1) throw new IOException("File ended early!");
-
-          mac.update(buffer, 0, read);
-
-          byte[] plaintext = cipher.update(buffer, 0, read);
-
-          if (plaintext != null) {
-            out.write(plaintext, 0, plaintext.length);
-          }
-
-          length -= read;
-        }
-
-        byte[] plaintext = cipher.doFinal();
-
-        if (plaintext != null) {
-          out.write(plaintext, 0, plaintext.length);
-        }
-
-        out.close();
-
-        byte[] ourMac   = mac.doFinal();
-        byte[] theirMac = new byte[10];
-
-        try {
-          Util.readFully(in, theirMac);
-        } catch (IOException e) {
-          //destination.delete();
-          throw new IOException(e);
-        }
-
-        if (MessageDigest.isEqual(ourMac, theirMac)) {
-          //destination.delete();
-          throw new IOException("Bad MAC");
-        }
-      } catch (InvalidKeyException | InvalidAlgorithmParameterException | IllegalBlockSizeException | BadPaddingException e) {
-        throw new AssertionError(e);
-      }
-    }
-
-    private BackupFrame readFrame(InputStream in) throws IOException {
-      try {
-        byte[] length = new byte[4];
-        Util.readFully(in, length);
-
-        byte[] frame = new byte[Conversions.byteArrayToInt(length)];
-        Util.readFully(in, frame);
-
-        byte[] theirMac = new byte[10];
-        System.arraycopy(frame, frame.length - 10, theirMac, 0, theirMac.length);
-
-        mac.update(frame, 0, frame.length - 10);
-        byte[] ourMac = mac.doFinal();
-
-        if (MessageDigest.isEqual(ourMac, theirMac)) {
-          throw new IOException("Bad MAC");
-        }
-
-        Conversions.intToByteArray(iv, 0, counter++);
-        cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(cipherKey, "AES"), new IvParameterSpec(iv));
-
-        byte[] plaintext = cipher.doFinal(frame, 0, frame.length - 10);
-
-        return BackupFrame.parseFrom(plaintext);
-      } catch (InvalidKeyException | InvalidAlgorithmParameterException | IllegalBlockSizeException | BadPaddingException e) {
-        throw new AssertionError(e);
-      }
-    }
-  }
-
-}
diff --git a/src/org/thoughtcrime/securesms/database/NotInDirectoryException.java b/src/org/thoughtcrime/securesms/database/NotInDirectoryException.java
deleted file mode 100644
index 92a150e0c..000000000
--- a/src/org/thoughtcrime/securesms/database/NotInDirectoryException.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.thoughtcrime.securesms.database;
-
-public class NotInDirectoryException extends Throwable {
-}
diff --git a/src/org/thoughtcrime/securesms/database/identity/IdentityRecordList.java b/src/org/thoughtcrime/securesms/database/identity/IdentityRecordList.java
deleted file mode 100644
index a92b06038..000000000
--- a/src/org/thoughtcrime/securesms/database/identity/IdentityRecordList.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.thoughtcrime.securesms.database.identity;
-
-
-import android.content.Context;
-
-import org.thoughtcrime.securesms.database.IdentityDatabase.IdentityRecord;
-import org.thoughtcrime.securesms.database.IdentityDatabase.VerifiedStatus;
-import org.thoughtcrime.securesms.recipients.Recipient;
-import org.whispersystems.libsignal.util.guava.Optional;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-public class IdentityRecordList {
-
-  private static final String TAG = IdentityRecordList.class.getSimpleName();
-
-  private final List<IdentityRecord> identityRecords = new LinkedList<>();
-
-  public void add(Optional<IdentityRecord> identityRecord) {
-    if (identityRecord.isPresent()) {
-      identityRecords.add(identityRecord.get());
-    }
-  }
-
-  public void replaceWith(IdentityRecordList identityRecordList) {
-    identityRecords.clear();
-    identityRecords.addAll(identityRecordList.identityRecords);
-  }
-
-  public boolean isVerified() {
-    for (IdentityRecord identityRecord : identityRecords) {
-      if (identityRecord.getVerifiedStatus() != VerifiedStatus.VERIFIED) {
-        return false;
-      }
-    }
-
-    return identityRecords.size() > 0;
-  }
-
-  public boolean isUnverified() {
-    for (IdentityRecord identityRecord : identityRecords) {
-      if (identityRecord.getVerifiedStatus() == VerifiedStatus.UNVERIFIED) {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-  public boolean isUntrusted() {
-    for (IdentityRecord identityRecord : identityRecords) {
-      if (isUntrusted(identityRecord)) {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-  public List<IdentityRecord> getUntrustedRecords() {
-    List<IdentityRecord> results = new LinkedList<>();
-
-    for (IdentityRecord identityRecord : identityRecords) {
-      if (isUntrusted(identityRecord)) {
-        results.add(identityRecord);
-      }
-    }
-
-    return results;
-  }
-
-  public List<Recipient> getUntrustedRecipients(Context context) {
-    List<Recipient> untrusted = new LinkedList<>();
-
-    for (IdentityRecord identityRecord : identityRecords) {
-      if (isUntrusted(identityRecord)) {
-        untrusted.add(Recipient.from(context, identityRecord.getAddress(), false));
-      }
-    }
-
-    return untrusted;
-  }
-
-  public List<IdentityRecord> getUnverifiedRecords() {
-    List<IdentityRecord> results = new LinkedList<>();
-
-    for (IdentityRecord identityRecord : identityRecords) {
-      if (identityRecord.getVerifiedStatus() == VerifiedStatus.UNVERIFIED) {
-        results.add(identityRecord);
-      }
-    }
-
-    return results;
-  }
-
-  public List<Recipient> getUnverifiedRecipients(Context context) {
-    List<Recipient> unverified = new LinkedList<>();
-
-    for (IdentityRecord identityRecord : identityRecords) {
-      if (identityRecord.getVerifiedStatus() == VerifiedStatus.UNVERIFIED) {
-        unverified.add(Recipient.from(context, identityRecord.getAddress(), false));
-      }
-    }
-
-    return unverified;
-  }
-
-  private boolean isUntrusted(IdentityRecord identityRecord) {
-    return !identityRecord.isApprovedNonBlocking() &&
-           System.currentTimeMillis() - identityRecord.getTimestamp() < TimeUnit.SECONDS.toMillis(5);
-  }
-
-}
diff --git a/src/org/thoughtcrime/securesms/mms/TextTransport.java b/src/org/thoughtcrime/securesms/mms/TextTransport.java
deleted file mode 100644
index 47735ab37..000000000
--- a/src/org/thoughtcrime/securesms/mms/TextTransport.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/** 
- * Copyright (C) 2011 Whisper Systems
- * Copyright (C) 2014 Open Whisper Systems
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.thoughtcrime.securesms.mms;
-
-import org.thoughtcrime.securesms.util.Base64;
-
-import java.io.IOException;
-
-
-public class TextTransport {
-
-  public byte[] getDecodedMessage(byte[] encodedMessageBytes) throws IOException {
-    return Base64.decode(encodedMessageBytes);
-  }
-
-  public byte[] getEncodedMessage(byte[] messageWithMac) {
-    return Base64.encodeBytes(messageWithMac).getBytes();
-  }
-}
diff --git a/src/org/thoughtcrime/securesms/preferences/MmsPreferencesActivity.java b/src/org/thoughtcrime/securesms/preferences/MmsPreferencesActivity.java
deleted file mode 100644
index 469f29e2a..000000000
--- a/src/org/thoughtcrime/securesms/preferences/MmsPreferencesActivity.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2011 Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.thoughtcrime.securesms.preferences;
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.view.MenuItem;
-
-import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity;
-import org.thoughtcrime.securesms.util.DynamicLanguage;
-import org.thoughtcrime.securesms.util.DynamicTheme;
-
-public class MmsPreferencesActivity extends PassphraseRequiredActionBarActivity {
-
-  private final DynamicTheme dynamicTheme       = new DynamicTheme();
-  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
-
-  @Override
-  protected void onPreCreate() {
-    dynamicTheme.onCreate(this);
-    dynamicLanguage.onCreate(this);
-  }
-
-  @Override
-  protected void onCreate(Bundle icicle, boolean ready) {
-    assert getSupportActionBar() != null;
-    this.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-    Fragment fragment = new MmsPreferencesFragment();
-    FragmentManager fragmentManager = getSupportFragmentManager();
-    FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
-    fragmentTransaction.replace(android.R.id.content, fragment);
-    fragmentTransaction.commit();
-
-  }
-
-  @Override
-  public void onResume() {
-    super.onResume();
-    dynamicTheme.onResume(this);
-    dynamicLanguage.onResume(this);
-  }
-
-  @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-    switch (item.getItemId()) {
-      case android.R.id.home:
-        finish();
-        return true;
-    }
-
-    return false;
-  }
-
-  @Override
-  public void onBackPressed() {
-    super.onBackPressed();
-  }
-
-}
diff --git a/src/org/thoughtcrime/securesms/util/PlayServicesUtil.java b/src/org/thoughtcrime/securesms/util/PlayServicesUtil.java
deleted file mode 100644
index 10e4d6d95..000000000
--- a/src/org/thoughtcrime/securesms/util/PlayServicesUtil.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.thoughtcrime.securesms.util;
-
-
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.util.Log;
-
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.GoogleApiAvailability;
-
-public class PlayServicesUtil {
-
-  private static final String TAG = PlayServicesUtil.class.getSimpleName();
-
-  public enum PlayServicesStatus {
-    SUCCESS,
-    MISSING,
-    NEEDS_UPDATE,
-    TRANSIENT_ERROR
-  }
-
-  public static PlayServicesStatus getPlayServicesStatus(Context context) {
-    int gcmStatus = 0;
-
-    try {
-      gcmStatus = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context);
-    } catch (Throwable t) {
-      Log.w(TAG, t);
-      return PlayServicesStatus.MISSING;
-    }
-
-    Log.w(TAG, "Play Services: " + gcmStatus);
-
-    switch (gcmStatus) {
-      case ConnectionResult.SUCCESS:
-        return PlayServicesStatus.SUCCESS;
-      case ConnectionResult.SERVICE_VERSION_UPDATE_REQUIRED:
-        try {
-          ApplicationInfo applicationInfo = context.getPackageManager().getApplicationInfo("com.google.android.gms", 0);
-
-          if (applicationInfo != null && !applicationInfo.enabled) {
-            return PlayServicesStatus.MISSING;
-          }
-        } catch (PackageManager.NameNotFoundException e) {
-          Log.w(TAG, e);
-        }
-
-        return PlayServicesStatus.NEEDS_UPDATE;
-      case ConnectionResult.SERVICE_DISABLED:
-      case ConnectionResult.SERVICE_MISSING:
-      case ConnectionResult.SERVICE_INVALID:
-      case ConnectionResult.API_UNAVAILABLE:
-      case ConnectionResult.SERVICE_MISSING_PERMISSION:
-        return PlayServicesStatus.MISSING;
-      default:
-        return PlayServicesStatus.TRANSIENT_ERROR;
-    }
-  }
-
-}