diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6a3cd05962..fc6475ed64 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -529,32 +529,6 @@
         <service
             android:name="org.thoughtcrime.securesms.service.IncomingMessageObserver$ForegroundService"
             android:enabled="true" />
-        <service
-            android:name="org.thoughtcrime.securesms.service.QuickResponseService"
-            android:exported="true"
-            android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE">
-            <intent-filter>
-                <action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:scheme="sms" />
-                <data android:scheme="smsto" />
-                <data android:scheme="mms" />
-                <data android:scheme="mmsto" />
-            </intent-filter>
-        </service>
-        <service
-            android:name="org.thoughtcrime.securesms.service.AccountAuthenticatorService"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.accounts.AccountAuthenticator" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.accounts.AccountAuthenticator"
-                android:resource="@xml/authenticator" />
-        </service>
         <service
             android:name="org.thoughtcrime.securesms.service.DirectShareService"
             android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
@@ -563,42 +537,6 @@
             </intent-filter>
         </service>
         <service android:name="org.thoughtcrime.securesms.service.GenericForegroundService" />
-
-        <receiver
-            android:name="org.thoughtcrime.securesms.service.SmsListener"
-            android:enabled="true"
-            android:exported="true"
-            android:permission="android.permission.BROADCAST_SMS">
-            <intent-filter android:priority="1001">
-                <action android:name="android.provider.Telephony.SMS_RECEIVED" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.provider.Telephony.SMS_DELIVER" />
-            </intent-filter>
-        </receiver>
-        <receiver
-            android:name="org.thoughtcrime.securesms.service.SmsDeliveryListener"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="org.thoughtcrime.securesms.services.MESSAGE_SENT" />
-            </intent-filter>
-        </receiver>
-        <receiver
-            android:name="org.thoughtcrime.securesms.service.MmsListener"
-            android:enabled="true"
-            android:exported="true"
-            android:permission="android.permission.BROADCAST_WAP_PUSH">
-            <intent-filter android:priority="1001">
-                <action android:name="android.provider.Telephony.WAP_PUSH_RECEIVED" />
-
-                <data android:mimeType="application/vnd.wap.mms-message" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER" />
-
-                <data android:mimeType="application/vnd.wap.mms-message" />
-            </intent-filter>
-        </receiver>
         <receiver
             android:name="org.thoughtcrime.securesms.notifications.MarkReadReceiver"
             android:enabled="true"
diff --git a/res/xml/authenticator.xml b/res/xml/authenticator.xml
deleted file mode 100644
index 37f811fe64..0000000000
--- a/res/xml/authenticator.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
-                       android:accountType="org.thoughtcrime.securesms"
-                       android:icon="@mipmap/ic_launcher"
-                       android:smallIcon="@mipmap/ic_launcher"
-                       android:label="@string/app_name"/>
-
diff --git a/src/org/thoughtcrime/securesms/service/AccountAuthenticatorService.java b/src/org/thoughtcrime/securesms/service/AccountAuthenticatorService.java
deleted file mode 100644
index 0106818277..0000000000
--- a/src/org/thoughtcrime/securesms/service/AccountAuthenticatorService.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.thoughtcrime.securesms.service;
-
-import android.accounts.AbstractAccountAuthenticator;
-import android.accounts.Account;
-import android.accounts.AccountAuthenticatorResponse;
-import android.accounts.NetworkErrorException;
-import android.app.Service;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.IBinder;
-
-public class AccountAuthenticatorService extends Service {
-
-  private static AccountAuthenticatorImpl accountAuthenticator = null;
-
-  @Override
-  public IBinder onBind(Intent intent) {
-    if (intent.getAction().equals(android.accounts.AccountManager.ACTION_AUTHENTICATOR_INTENT)) {
-      return getAuthenticator().getIBinder();
-    } else {
-      return null;
-    }
-  }
-
-  private synchronized AccountAuthenticatorImpl getAuthenticator() {
-    if (accountAuthenticator == null) {
-      accountAuthenticator = new AccountAuthenticatorImpl(this);
-    }
-
-    return accountAuthenticator;
-  }
-
-  private static class AccountAuthenticatorImpl extends AbstractAccountAuthenticator {
-
-    public AccountAuthenticatorImpl(Context context) {
-      super(context);
-    }
-
-    @Override
-    public Bundle addAccount(AccountAuthenticatorResponse response, String accountType, String authTokenType,
-                             String[] requiredFeatures, Bundle options)
-        throws NetworkErrorException
-    {
-      return null;
-    }
-
-    public Bundle confirmCredentials(AccountAuthenticatorResponse response, Account account, Bundle options) {
-      return null;
-    }
-
-    @Override
-    public Bundle editProperties(AccountAuthenticatorResponse response, String accountType) {
-      return null;
-    }
-
-    @Override
-    public Bundle getAuthToken(AccountAuthenticatorResponse response, Account account, String authTokenType,
-                               Bundle options) throws NetworkErrorException {
-      return null;
-    }
-
-    @Override
-    public String getAuthTokenLabel(String authTokenType) {
-      return null;
-    }
-
-    @Override
-    public Bundle hasFeatures(AccountAuthenticatorResponse response, Account account, String[] features)
-        throws NetworkErrorException {
-      return null;
-    }
-
-    @Override
-    public Bundle updateCredentials(AccountAuthenticatorResponse response, Account account, String authTokenType,
-                                    Bundle options) {
-      return null;
-    }
-  }
-}