diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7cc88381..a9123639 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,6 +16,7 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.gms"
     android:versionName="1.0"
     android:versionCode="6599436">
@@ -33,10 +34,8 @@
 
     <application
         android:theme="@style/AppTheme"
-        android:label="@string/gms_app_name">
-        <uses-library
-            android:name="com.android.location.provider"
-            android:required="false" />
+        android:label="@string/gms_app_name"
+        tools:replace="android:label">
         <uses-library
             android:name="com.google.android.maps"
             android:required="false" />
@@ -44,63 +43,6 @@
         <meta-data android:name="fake-signature"
             android:value="@string/fake_signature" />
 
-        <!-- Jelly Bean / KitKat -->
-        <service
-            android:name="org.microg.nlp.location.LocationServiceV2"
-            android:exported="true">
-            <intent-filter>
-                <!-- KitKat changed the action name but nothing else, hence we handle it the same -->
-                <action android:name="com.android.location.service.v3.NetworkLocationProvider" />
-                <action android:name="com.android.location.service.v2.NetworkLocationProvider" />
-            </intent-filter>
-
-            <meta-data
-                android:name="serviceVersion"
-                android:value="2" />
-            <meta-data
-                android:name="serviceIsMultiuser"
-                android:value="false" />
-        </service>
-
-        <service
-            android:name="org.microg.nlp.geocode.GeocodeServiceV1"
-            android:exported="true">
-            <intent-filter>
-                <!-- Jelly Bean changed the action name but nothing else, hence we handle it the same -->
-                <action android:name="com.android.location.service.GeocodeProvider" />
-                <action android:name="com.google.android.location.GeocodeProvider" />
-            </intent-filter>
-
-            <meta-data
-                android:name="serviceVersion"
-                android:value="2" />
-            <meta-data
-                android:name="serviceIsMultiuser"
-                android:value="false" />
-        </service>
-
-        <activity
-            android:name="org.microg.nlp.ui.SettingsActivity"
-            android:label="@string/nlp_settings_label">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-
-        <receiver android:name="org.microg.nlp.PackageReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.PACKAGE_ADDED" />
-                <action android:name="android.intent.action.PACKAGE_CHANGED" />
-                <action android:name="android.intent.action.PACKAGE_UPGRADED" />
-                <action android:name="android.intent.action.PACKAGE_REMOVED" />
-                <action android:name="android.intent.action.PACKAGE_REPLACED" />
-                <action android:name="android.intent.action.PACKAGE_RESTARTED" />
-
-                <data android:scheme="package" />
-            </intent-filter>
-        </receiver>
-
         <service
             android:name="com.google.android.location.internal.server.GoogleLocationService"
             android:permission="android.permission.ACCESS_COARSE_LOCATION"
diff --git a/build.gradle b/build.gradle
index 406fd400..fad4b256 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,7 +31,7 @@ android {
      * not a big problem right now.
      */
     compileSdkVersion 'Google Inc.:Google APIs:21'
-    buildToolsVersion "21.0.2"
+    buildToolsVersion "21.1.2"
     lintOptions.abortOnError false
 
     sourceSets {