diff --git a/Android.mk b/Android.mk
index c3591fb..beb94be 100644
--- a/Android.mk
+++ b/Android.mk
@@ -2,7 +2,6 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-
 # Determine the target architecture directory and pattern
 ifeq ($(TARGET_ARCH),arm64)
   ARCH_DIR := arm64
@@ -15,8 +14,9 @@ else ifeq ($(TARGET_ARCH),x86_64)
   APK_PATTERN := *x86-64*.apk
 else
   $(warning Unsupported architecture $(TARGET_ARCH) for VivladiBrowser)
-  APK_PATTERN := 
+  APK_PATTERN :=
 endif
+
 ifneq ($(APK_PATTERN),)
   APK_FILE := $(firstword $(wildcard $(LOCAL_PATH)/prebuilt/$(ARCH_DIR)/$(APK_PATTERN)))
 
@@ -28,23 +28,16 @@ ifneq ($(APK_PATTERN),)
     LOCAL_MODULE := VivladiBrowser
     LOCAL_MODULE_TAGS := optional
     LOCAL_MODULE_CLASS := APPS
-    LOCAL_MODULE_PATH := $(TARGET_OUT_PRIV_APPS)/VivladiBrowser
     LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
     LOCAL_SRC_FILES := prebuilt/$(ARCH_DIR)/$(notdir $(APK_FILE))
     LOCAL_CERTIFICATE := PRESIGNED
 
-    # Override stock browser(s)
+    # Override stock browsers
     LOCAL_OVERRIDES_PACKAGES := Browser Browser2
 
-    LOCAL_OPTIONAL_USES_LIBRARIES := \
-        android.car \
-        androidx.window.extensions \
-        com.android.extensions.xr \
-        android.ext.adservices \
-        androidx.window.sidecar
-    
+    # No preopt to avoid build-time dex issues
     LOCAL_DEX_PREOPT := false
 
     include $(BUILD_PREBUILT)
   endif
-endif
\ No newline at end of file
+endif