diff --git a/device-bluejay.mk b/device-bluejay.mk
index 30d9c16..e9801b8 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -197,22 +197,6 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.support_one_handed_mode=true
 
-# Voice packs for Text-To-Speech
-PRODUCT_COPY_FILES += \
-	$(LOCAL_PATH)/tts/ja-jp/ja-jp-x-multi-darwinn-wavernn-r27.zvoice:product/tts/google/ja-jp/ja-jp-x-multi-darwinn-wavernn-r27.zvoice\
-	$(LOCAL_PATH)/tts/ja-jp/ja-jp-x-multi-r27.zvoice:product/tts/google/ja-jp/ja-jp-x-multi-r27.zvoice\
-	$(LOCAL_PATH)/tts/ja-jp/ja-jp-x-multi-wavernn-r27.zvoice:product/tts/google/ja-jp/ja-jp-x-multi-wavernn-r27.zvoice\
-	$(LOCAL_PATH)/tts/fr-fr/fr-fr-x-multi-darwinn-wavernn-r27.zvoice:product/tts/google/fr-fr/fr-fr-x-multi-darwinn-wavernn-r27.zvoice\
-	$(LOCAL_PATH)/tts/fr-fr/fr-fr-x-multi-r27.zvoice:product/tts/google/fr-fr/fr-fr-x-multi-r27.zvoice\
-	$(LOCAL_PATH)/tts/fr-fr/fr-fr-x-multi-wavernn-r27.zvoice:product/tts/google/fr-fr/fr-fr-x-multi-wavernn-r27.zvoice\
-	$(LOCAL_PATH)/tts/de-de/de-de-x-multi-darwinn-wavernn-r27.zvoice:product/tts/google/de-de/de-de-x-multi-darwinn-wavernn-r27.zvoice\
-	$(LOCAL_PATH)/tts/de-de/de-de-x-multi-r27.zvoice:product/tts/google/de-de/de-de-x-multi-r27.zvoice\
-	$(LOCAL_PATH)/tts/de-de/de-de-x-multi-wavernn-r27.zvoice:product/tts/google/de-de/de-de-x-multi-wavernn-r27.zvoice\
-	$(LOCAL_PATH)/tts/it-it/it-it-x-multi-r24.zvoice:product/tts/google/it-it/it-it-x-multi-r24.zvoice\
-	$(LOCAL_PATH)/tts/es-es/es-es-x-multi-darwinn-wavernn-r27.zvoice:product/tts/google/es-es/es-es-x-multi-darwinn-wavernn-r27.zvoice\
-	$(LOCAL_PATH)/tts/es-es/es-es-x-multi-r27.zvoice:product/tts/google/es-es/es-es-x-multi-r27.zvoice\
-	$(LOCAL_PATH)/tts/es-es/es-es-x-multi-wavernn-r27.zvoice:product/tts/google/es-es/es-es-x-multi-wavernn-r27.zvoice
-
 # GPS xml
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 	PRODUCT_COPY_FILES += \
diff --git a/gps.xml.b3 b/gps.xml.b3
index 386f543..f3374bd 100644
--- a/gps.xml.b3
+++ b/gps.xml.b3
@@ -57,11 +57,9 @@
        CpLppeUseAgnssLocForEmptyDbh="true"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
-       PpsDevice="/sys/class/pps/pps0/assert_elapsed"
   />
 
   <gll
-       PpsEnable="true"
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
diff --git a/gps_user.xml.b3 b/gps_user.xml.b3
index cceea19..be6ff1b 100644
--- a/gps_user.xml.b3
+++ b/gps_user.xml.b3
@@ -56,11 +56,9 @@
        CpLppeUseAgnssLocForEmptyDbh="true"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
-       PpsDevice="/sys/class/pps/pps0/assert_elapsed"
   />
 
   <gll
-       PpsEnable="true"
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
diff --git a/powerhint.json b/powerhint.json
index 8bba4aa..f84a28e 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -143,7 +143,7 @@
       "Path": "/proc/vendor_sched/ta_uclamp_min",
       "Values": [
         "553",
-        "129",
+        "185",
         "1",
         "55"
       ],
@@ -1237,7 +1237,7 @@
       "PowerHint": "BOOST_60HZ",
       "Node": "TAUClampBoost",
       "Duration": 200,
-      "Value": "129"
+      "Value": "185"
     },
     {
       "PowerHint": "DISPLAY_IDLE",
@@ -1267,11 +1267,6 @@
       "Duration": 50,
       "Value": "1"
     },
-    {
-      "PowerHint": "DISPLAY_UPDATE_IMMINENT",
-      "Type": "DoHint",
-      "Value": "BOOST_DISPLAY"
-    },
     {
       "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL",
       "Node": "LimitFlashCurrent",
diff --git a/tts/de-de/de-de-x-multi-darwinn-wavernn-r27.zvoice b/tts/de-de/de-de-x-multi-darwinn-wavernn-r27.zvoice
deleted file mode 100644
index 174f958..0000000
Binary files a/tts/de-de/de-de-x-multi-darwinn-wavernn-r27.zvoice and /dev/null differ
diff --git a/tts/de-de/de-de-x-multi-r27.zvoice b/tts/de-de/de-de-x-multi-r27.zvoice
deleted file mode 100644
index aceddfe..0000000
Binary files a/tts/de-de/de-de-x-multi-r27.zvoice and /dev/null differ
diff --git a/tts/de-de/de-de-x-multi-wavernn-r27.zvoice b/tts/de-de/de-de-x-multi-wavernn-r27.zvoice
deleted file mode 100644
index d4b54d6..0000000
Binary files a/tts/de-de/de-de-x-multi-wavernn-r27.zvoice and /dev/null differ
diff --git a/tts/es-es/es-es-x-multi-darwinn-wavernn-r27.zvoice b/tts/es-es/es-es-x-multi-darwinn-wavernn-r27.zvoice
deleted file mode 100644
index 8bc7604..0000000
Binary files a/tts/es-es/es-es-x-multi-darwinn-wavernn-r27.zvoice and /dev/null differ
diff --git a/tts/es-es/es-es-x-multi-r27.zvoice b/tts/es-es/es-es-x-multi-r27.zvoice
deleted file mode 100644
index cd0c12c..0000000
Binary files a/tts/es-es/es-es-x-multi-r27.zvoice and /dev/null differ
diff --git a/tts/es-es/es-es-x-multi-wavernn-r27.zvoice b/tts/es-es/es-es-x-multi-wavernn-r27.zvoice
deleted file mode 100644
index 3ebcaa5..0000000
Binary files a/tts/es-es/es-es-x-multi-wavernn-r27.zvoice and /dev/null differ
diff --git a/tts/fr-fr/fr-fr-x-multi-darwinn-wavernn-r27.zvoice b/tts/fr-fr/fr-fr-x-multi-darwinn-wavernn-r27.zvoice
deleted file mode 100644
index 9297b10..0000000
Binary files a/tts/fr-fr/fr-fr-x-multi-darwinn-wavernn-r27.zvoice and /dev/null differ
diff --git a/tts/fr-fr/fr-fr-x-multi-r27.zvoice b/tts/fr-fr/fr-fr-x-multi-r27.zvoice
deleted file mode 100644
index a5120b0..0000000
Binary files a/tts/fr-fr/fr-fr-x-multi-r27.zvoice and /dev/null differ
diff --git a/tts/fr-fr/fr-fr-x-multi-wavernn-r27.zvoice b/tts/fr-fr/fr-fr-x-multi-wavernn-r27.zvoice
deleted file mode 100644
index 7c00516..0000000
Binary files a/tts/fr-fr/fr-fr-x-multi-wavernn-r27.zvoice and /dev/null differ
diff --git a/tts/it-it/it-it-x-multi-r24.zvoice b/tts/it-it/it-it-x-multi-r24.zvoice
deleted file mode 100644
index 240e7fb..0000000
Binary files a/tts/it-it/it-it-x-multi-r24.zvoice and /dev/null differ
diff --git a/tts/ja-jp/ja-jp-x-multi-darwinn-wavernn-r27.zvoice b/tts/ja-jp/ja-jp-x-multi-darwinn-wavernn-r27.zvoice
deleted file mode 100644
index 97b4f51..0000000
Binary files a/tts/ja-jp/ja-jp-x-multi-darwinn-wavernn-r27.zvoice and /dev/null differ
diff --git a/tts/ja-jp/ja-jp-x-multi-r27.zvoice b/tts/ja-jp/ja-jp-x-multi-r27.zvoice
deleted file mode 100644
index 651d4ef..0000000
Binary files a/tts/ja-jp/ja-jp-x-multi-r27.zvoice and /dev/null differ
diff --git a/tts/ja-jp/ja-jp-x-multi-wavernn-r27.zvoice b/tts/ja-jp/ja-jp-x-multi-wavernn-r27.zvoice
deleted file mode 100644
index 66471c1..0000000
Binary files a/tts/ja-jp/ja-jp-x-multi-wavernn-r27.zvoice and /dev/null differ