diff --git a/universal7885-common/apps/CameraLightSensor/Android.bp b/universal7885-common/apps/CameraLightSensor/Android.bp
index 6c8e4e6..9f4e546 100644
--- a/universal7885-common/apps/CameraLightSensor/Android.bp
+++ b/universal7885-common/apps/CameraLightSensor/Android.bp
@@ -7,7 +7,4 @@ android_app {
     privileged: true,
     certificate: "platform",
     static_libs: [ "androidx.core_core" ],
-    optimize: {
-        proguard_flags_files: ["proguard.flags"],
-    },
 }
diff --git a/universal7885-common/apps/CameraLightSensor/AndroidManifest.xml b/universal7885-common/apps/CameraLightSensor/AndroidManifest.xml
index 3053306..d0165f0 100755
--- a/universal7885-common/apps/CameraLightSensor/AndroidManifest.xml
+++ b/universal7885-common/apps/CameraLightSensor/AndroidManifest.xml
@@ -30,13 +30,14 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </receiver>
-        <activity
+        <service
             android:name=".CameraLightSensorService"
-            android:exported="true">
+	    android:exported="true"
+	    android:foregroundServiceType="camera">
             <intent-filter android:priority="1000">
                 <action android:name="android.intent.action.SCREEN_OFF" />
                 <action android:name="android.intent.action.SCREEN_ON" />
             </intent-filter>
-        </activity>
+        </service>
     </application>
 </manifest>
diff --git a/universal7885-common/apps/CameraLightSensor/proguard.flags b/universal7885-common/apps/CameraLightSensor/proguard.flags
deleted file mode 100755
index 25042b4..0000000
--- a/universal7885-common/apps/CameraLightSensor/proguard.flags
+++ /dev/null
@@ -1,7 +0,0 @@
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
--keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
--renamesourcefileattribute SourceFile
diff --git a/universal7885-common/apps/CameraLightSensor/src/com/eurekateam/cameralightsensor/BootReceiver.java b/universal7885-common/apps/CameraLightSensor/src/com/eurekateam/cameralightsensor/BootReceiver.java
index c15b565..b849dbe 100755
--- a/universal7885-common/apps/CameraLightSensor/src/com/eurekateam/cameralightsensor/BootReceiver.java
+++ b/universal7885-common/apps/CameraLightSensor/src/com/eurekateam/cameralightsensor/BootReceiver.java
@@ -3,15 +3,14 @@ package com.eurekateam.cameralightsensor;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import com.eurekateam.cameralightsensor.CameraLightSensorService;
 
 public class BootReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
         if (intent.getAction().equalsIgnoreCase(Intent.ACTION_BOOT_COMPLETED)) {
             if (context != null) {
-                final Intent i = new Intent();
-                i.setClassName("com.eurekateam.cameralightsensor",
-                        "com.eurekateam.cameralightsensor.CameraLightSensorService");
+                final Intent i = new Intent(context, CameraLightSensorService.class);
                 context.startForegroundService(i);
             }
         }
diff --git a/universal7885-common/rro_overlays/TetheringOverlay/res/values/array.xml b/universal7885-common/rro_overlays/TetheringOverlay/res/values/array.xml
deleted file mode 100644
index 4d25fab..0000000
--- a/universal7885-common/rro_overlays/TetheringOverlay/res/values/array.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string-array translatable="false" name="config_tether_wifi_regexs">
-        <item>"wlan\\d"</item>
-        <item>"swlan\\d"</item>
-    </string-array>
-</resources>