diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java
deleted file mode 100644
index c843433097..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package org.thoughtcrime.securesms.database.loaders;
-
-import android.content.Context;
-import android.text.TextUtils;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.VisibleForTesting;
-
-import com.annimon.stream.Stream;
-
-import org.signal.core.util.logging.Log;
-import org.signal.libsignal.protocol.IdentityKeyPair;
-import org.signal.libsignal.protocol.InvalidKeyException;
-import org.signal.libsignal.protocol.ecc.Curve;
-import org.signal.libsignal.protocol.ecc.ECPrivateKey;
-import org.signal.libsignal.protocol.ecc.ECPublicKey;
-import org.signal.libsignal.protocol.util.ByteUtil;
-import org.thoughtcrime.securesms.devicelist.Device;
-import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.registration.secondary.DeviceNameCipher;
-import org.thoughtcrime.securesms.util.AsyncLoader;
-import org.signal.core.util.Base64;
-import org.whispersystems.signalservice.api.SignalServiceAccountManager;
-import org.whispersystems.signalservice.api.messages.multidevice.DeviceInfo;
-import org.whispersystems.signalservice.api.push.SignalServiceAddress;
-
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.security.MessageDigest;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Objects;
-
-import javax.crypto.Cipher;
-import javax.crypto.Mac;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.thoughtcrime.securesms.devicelist.protos.DeviceName;
-
-public class DeviceListLoader extends AsyncLoader<List<Device>> {
-
-  private static final String TAG = Log.tag(DeviceListLoader.class);
-
-  private final SignalServiceAccountManager accountManager;
-
-  public DeviceListLoader(Context context, SignalServiceAccountManager accountManager) {
-    super(context);
-    this.accountManager = accountManager;
-  }
-
-  @Override
-  public List<Device> loadInBackground() {
-    try {
-      List<Device> devices = Stream.of(accountManager.getDevices())
-                                   .filter(d -> d.getId() != SignalServiceAddress.DEFAULT_DEVICE_ID)
-                                   .map(this::mapToDevice)
-                                   .toList();
-
-      Collections.sort(devices, new DeviceComparator());
-
-      return devices;
-    } catch (IOException e) {
-      Log.w(TAG, e);
-      return null;
-    }
-  }
-
-  private Device mapToDevice(@NonNull DeviceInfo deviceInfo) {
-    try {
-      if (TextUtils.isEmpty(deviceInfo.getName()) || deviceInfo.getName().length() < 4) {
-        throw new IOException("Invalid DeviceInfo name.");
-      }
-
-      DeviceName deviceName = DeviceName.ADAPTER.decode(Base64.decode(deviceInfo.getName()));
-
-      if (deviceName.ciphertext == null || deviceName.ephemeralPublic == null || deviceName.syntheticIv == null) {
-        throw new IOException("Got a DeviceName that wasn't properly populated.");
-      }
-
-      byte[] plaintext = DeviceNameCipher.decryptDeviceName(deviceName, SignalStore.account().getAciIdentityKey());
-      if (plaintext == null) {
-        throw new IOException("Failed to decrypt device name.");
-      }
-
-      return new Device(deviceInfo.getId(), new String(plaintext), deviceInfo.getCreated(), deviceInfo.getLastSeen());
-    } catch (IOException e) {
-      Log.w(TAG, "Failed while reading the protobuf.", e);
-    }
-
-    return new Device(deviceInfo.getId(), deviceInfo.getName(), deviceInfo.getCreated(), deviceInfo.getLastSeen());
-  }
-
-  private static class DeviceComparator implements Comparator<Device> {
-
-    @Override
-    public int compare(Device lhs, Device rhs) {
-      if      (lhs.getCreated() < rhs.getCreated())  return -1;
-      else if (lhs.getCreated() != rhs.getCreated()) return 1;
-      else                                           return 0;
-    }
-  }
-}
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java
index 0982f1c365..b442fc0868 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java
@@ -509,40 +509,6 @@ public class SignalServiceAccountManager {
     return pushServiceSocket.getAccountDataReport();
   }
 
-  public void addDevice(String deviceIdentifier,
-                        ECPublicKey deviceKey,
-                        IdentityKeyPair aciIdentityKeyPair,
-                        IdentityKeyPair pniIdentityKeyPair,
-                        ProfileKey profileKey,
-                        MasterKey masterKey,
-                        String code)
-      throws InvalidKeyException, IOException
-  {
-    String e164 = credentials.getE164();
-    ACI    aci  = credentials.getAci();
-    PNI    pni  = credentials.getPni();
-
-    Preconditions.checkArgument(e164 != null, "Missing e164!");
-    Preconditions.checkArgument(aci != null, "Missing ACI!");
-    Preconditions.checkArgument(pni != null, "Missing PNI!");
-
-    PrimaryProvisioningCipher cipher  = new PrimaryProvisioningCipher(deviceKey);
-    ProvisionMessage.Builder  message = new ProvisionMessage.Builder()
-                                                            .aciIdentityKeyPublic(ByteString.of(aciIdentityKeyPair.getPublicKey().serialize()))
-                                                            .aciIdentityKeyPrivate(ByteString.of(aciIdentityKeyPair.getPrivateKey().serialize()))
-                                                            .pniIdentityKeyPublic(ByteString.of(pniIdentityKeyPair.getPublicKey().serialize()))
-                                                            .pniIdentityKeyPrivate(ByteString.of(pniIdentityKeyPair.getPrivateKey().serialize()))
-                                                            .aci(aci.toString())
-                                                            .pni(pni.toStringWithoutPrefix())
-                                                            .number(e164)
-                                                            .profileKey(ByteString.of(profileKey.serialize()))
-                                                            .provisioningCode(code)
-                                                            .provisioningVersion(ProvisioningVersion.CURRENT.getValue())
-                                                            .masterKey(ByteString.of(masterKey.serialize()));
-
-    byte[] ciphertext = cipher.encrypt(message.build());
-    this.pushServiceSocket.sendProvisioningMessage(deviceIdentifier, ciphertext);
-  }
 
   public List<DeviceInfo> getDevices() throws IOException {
     return this.pushServiceSocket.getDevices();