diff --git a/arm/Android.bp b/arm/Android.bp
index facca5b..9a6275c 100644
--- a/arm/Android.bp
+++ b/arm/Android.bp
@@ -66,10 +66,3 @@ android_app_import {
     },
     product_specific: true,
 }
-
-cc_prebuilt_library_shared {
-    name: "libjni_latinimegoogle",
-    srcs: ["proprietary/product/lib/libjni_latinimegoogle.so"],
-    prefer: true,
-    product_specific: true,
-}
diff --git a/arm/arm-vendor.mk b/arm/arm-vendor.mk
index 10a7d80..4cf1491 100644
--- a/arm/arm-vendor.mk
+++ b/arm/arm-vendor.mk
@@ -6,8 +6,7 @@ PRODUCT_SOONG_NAMESPACES += \
 
 PRODUCT_PACKAGES += \
     GmsCore \
-    Phonesky \
-    libjni_latinimegoogle
+    Phonesky 
 
 ifeq ($(TARGET_IS_GROUPER),)
 PRODUCT_PACKAGES += \
diff --git a/arm64/Android.bp b/arm64/Android.bp
index 840d884..ddb92b9 100644
--- a/arm64/Android.bp
+++ b/arm64/Android.bp
@@ -92,10 +92,3 @@ android_app_import {
     },
     product_specific: true,
 }
-
-cc_prebuilt_library_shared {
-    name: "libjni_latinimegoogle",
-    srcs: ["proprietary/product/lib64/libjni_latinimegoogle.so"],
-    prefer: true,
-    product_specific: true,
-}
diff --git a/arm64/arm64-vendor.mk b/arm64/arm64-vendor.mk
index 37f57d8..0112f34 100644
--- a/arm64/arm64-vendor.mk
+++ b/arm64/arm64-vendor.mk
@@ -6,8 +6,7 @@ PRODUCT_SOONG_NAMESPACES += \
 
 PRODUCT_PACKAGES += \
     GmsCore \
-    Phonesky \
-    libjni_latinimegoogle
+    Phonesky 
 
 ifeq ($(TARGET_IS_GROUPER),)
 PRODUCT_PACKAGES += \
diff --git a/common/Android.bp b/common/Android.bp
index 6d76f8d..f6949ba 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -180,14 +180,6 @@ prebuilt_etc {
     product_specific: true,
 }
 
-prebuilt_etc {
-    name: "google.xml",
-    src: "proprietary/product/etc/sysconfig/google.xml",
-    relative_install_path: "sysconfig",
-    filename_from_src: true,
-    product_specific: true,
-}
-
 prebuilt_etc {
     name: "google_build.xml",
     src: "proprietary/product/etc/sysconfig/google_build.xml",
diff --git a/common/common-vendor.mk b/common/common-vendor.mk
index dc9df43..c966fd0 100644
--- a/common/common-vendor.mk
+++ b/common/common-vendor.mk
@@ -20,7 +20,6 @@ PRODUCT_PACKAGES += \
     gapps.rc \
     gms_fsverity_cert.der \
     google-hiddenapi-package-allowlist.xml \
-    google.xml \
     google_build.xml \
     privapp-permissions-google-product.xml \
     privapp-permissions-google-system-ext.xml \
diff --git a/x86_64/Android.bp b/x86_64/Android.bp
index 64e4ec5..326e21d 100644
--- a/x86_64/Android.bp
+++ b/x86_64/Android.bp
@@ -57,9 +57,3 @@ android_app_import {
     product_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libjni_latinimegoogle",
-    srcs: ["proprietary/product/lib64/libjni_latinimegoogle.so"],
-    prefer: true,
-    product_specific: true,
-}
diff --git a/x86_64/x86_64-vendor.mk b/x86_64/x86_64-vendor.mk
index 46c7ee0..014163c 100644
--- a/x86_64/x86_64-vendor.mk
+++ b/x86_64/x86_64-vendor.mk
@@ -6,8 +6,7 @@ PRODUCT_SOONG_NAMESPACES += \
 
 PRODUCT_PACKAGES += \
     GmsCore \
-    Phonesky \
-    libjni_latinimegoogle
+    Phonesky 
 
 ifeq ($(TARGET_IS_GROUPER),)
 PRODUCT_PACKAGES += \