diff --git a/play-services-core/src/main/java/org/microg/gms/ui/SettingsActivity.java b/play-services-core/src/main/java/org/microg/gms/ui/SettingsActivity.java
index 88b8f2b0..efc6313b 100644
--- a/play-services-core/src/main/java/org/microg/gms/ui/SettingsActivity.java
+++ b/play-services-core/src/main/java/org/microg/gms/ui/SettingsActivity.java
@@ -81,7 +81,6 @@ public class SettingsActivity extends AbstractDashboardActivity {
                 findPreference(PREF_GCM).setSummary(R.string.abc_capital_off);
             }
 
-                findPreference(PREF_SNET).setSummary(R.string.service_status_disabled);
 
 //            Preferences unifiedNlPrefs = new Preferences(getContext());
 //            int backendCount = TextUtils.isEmpty(unifiedNlPrefs.getLocationBackends()) ? 0 :
diff --git a/play-services-core/src/main/res/xml/preferences_snet.xml b/play-services-core/src/main/res/xml/preferences_snet.xml
deleted file mode 100644
index 8a60cf3e..00000000
--- a/play-services-core/src/main/res/xml/preferences_snet.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2017 microG Project Team
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <org.microg.tools.ui.LongTextPreference
-        android:selectable="false"
-        android:key="pref_snet_summary"
-        android:summary="@string/snet_intro"/>
-    <PreferenceCategory android:title="@string/prefcat_test">
-        <Preference
-            android:enabled="false"
-            android:key="pref_snet_run_attest"
-            android:summary="Not yet available"
-            android:title="@string/pref_snet_testdrive_title"/>
-    </PreferenceCategory>
-</PreferenceScreen>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/xml/preferences_snet_advanced.xml b/play-services-core/src/main/res/xml/preferences_snet_advanced.xml
deleted file mode 100644
index e87859af..00000000
--- a/play-services-core/src/main/res/xml/preferences_snet_advanced.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2017 microG Project Team
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory android:title="@string/prefcat_operation_mode">
-        <org.microg.tools.ui.RadioButtonPreference
-            android:checked="true"
-            android:key="snet_official"
-            android:summary="@string/pref_snet_status_official_summary"
-            android:title="@string/pref_snet_status_official_title"/>
-        <org.microg.tools.ui.RadioButtonPreference
-            android:checked="false"
-            android:enabled="false"
-            android:key="snet_self_signed"
-            android:summary="@string/pref_snet_self_signed_summary"
-            android:title="@string/pref_snet_self_signed_title"/>
-        <org.microg.tools.ui.RadioButtonPreference
-            android:checked="false"
-            android:key="snet_third_party"
-            android:summary="@string/pref_snet_status_third_party_summary"
-            android:title="@string/pref_snet_status_third_party_title"/>
-        <EditTextPreference
-            android:dependency="snet_third_party"
-            android:hint="https://example.com/server?key=123"
-            android:key="snet_custom_url"
-            android:summary="@string/pref_snet_custom_url_summary"
-            android:title="@string/pref_snet_custom_url_title"/>
-    </PreferenceCategory>
-</PreferenceScreen>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/xml/preferences_start.xml b/play-services-core/src/main/res/xml/preferences_start.xml
index 85b5e3d0..b774d823 100644
--- a/play-services-core/src/main/res/xml/preferences_start.xml
+++ b/play-services-core/src/main/res/xml/preferences_start.xml
@@ -15,16 +15,6 @@
   -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory android:title="@string/prefcat_setup">
-        <org.microg.tools.ui.TintIconPreference
-            android:icon="@drawable/self_check"
-            android:summary="@string/self_check_desc"
-            android:title="@string/self_check_title">
-            <intent
-                android:targetClass="org.microg.gms.ui.SelfCheckFragment$AsActivity"
-                android:targetPackage="com.mgoogle.android.gms"/>
-        </org.microg.tools.ui.TintIconPreference>
-    </PreferenceCategory>
     <PreferenceCategory android:title="@string/prefcat_google_services">
         <org.microg.tools.ui.TintIconPreference
             android:icon="@drawable/add_account"
@@ -50,31 +40,6 @@
                 android:targetClass="org.microg.gms.ui.GcmFragment$AsActivity"
                 android:targetPackage="com.mgoogle.android.gms"/>
         </org.microg.tools.ui.TintIconPreference>
-        <org.microg.tools.ui.TintIconPreference
-            android:icon="@drawable/certificate"
-            android:key="pref_snet"
-            android:title="@string/service_name_snet">
-            <intent
-                android:targetClass="org.microg.gms.ui.SafetyNetFragment$AsActivity"
-                android:targetPackage="com.mgoogle.android.gms"/>
-        </org.microg.tools.ui.TintIconPreference>
-        <org.microg.tools.ui.TintIconPreference
-            android:icon="@drawable/dots_horizontal"
-            android:key="pref_google_more"
-            android:title="@string/pref_more_settings">
-            <intent
-                android:targetClass="org.microg.gms.ui.GoogleMoreFragment$AsActivity"
-                android:targetPackage="com.mgoogle.android.gms"/>
-        </org.microg.tools.ui.TintIconPreference>
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/prefcat_configuration">
-        <org.microg.tools.ui.TintIconPreference
-            android:key="pref_unifiednlp"
-            android:title="UnifiedNlp">
-            <intent
-                android:targetClass="org.microg.nlp.ui.BackendSettingsActivity"
-                android:targetPackage="com.mgoogle.android.gms"/>
-        </org.microg.tools.ui.TintIconPreference>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/prefcat_about">
         <org.microg.tools.ui.TintIconPreference