diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index bf63c26f..7b241f3f 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -985,19 +985,10 @@ on property:vendor.thermal.link_ready=1
     chown system system /dev/thermal/cdev-by-name/wlc_fcc/cur_state
     chown system system /dev/thermal/cdev-by-name/usbc-port/cur_state
 
-# Create thermal symlink in off charging mode
 on charger
-    mkdir /dev/thermal 0750 system system
-    mkdir /dev/thermal/tz-by-name 0750 system system
-    mkdir /dev/thermal/cdev-by-name 0750 system system
-    start vendor.thermal.symlinks
     write /proc/vendor_sched/sys_uclamp_min 0
     write /proc/vendor_sched/sys_prefer_idle 0
 
-# Launch thermal hal in off charging mode
-on charger && property:vendor.thermal.link_ready=1
-    start vendor.thermal-hal-2-0
-
 on property:vendor.disable.bcl.control=1
     write /sys/devices/virtual/pmic/mitigation/instruction/enable_mitigation 0
 
diff --git a/device.mk b/device.mk
index 3a85217e..6cb0b3b0 100644
--- a/device.mk
+++ b/device.mk
@@ -506,8 +506,6 @@ PRODUCT_PACKAGES += \
 # for now include gralloc here. should come from hardware/google_devices/exynos5
 PRODUCT_PACKAGES += \
 	android.hardware.graphics.mapper@4.0-impl \
-	android.hardware.graphics.allocator@4.0-service \
-	android.hardware.graphics.allocator@4.0-impl \
 	android.hardware.graphics.allocator-V1-service
 
 PRODUCT_PACKAGES += \
diff --git a/manifest.xml b/manifest.xml
index 1d59695c..1cb5345a 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -39,15 +39,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.graphics.allocator</name>
-        <transport>hwbinder</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IAllocator</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.graphics.mapper</name>
         <transport arch="32+64">passthrough</transport>
diff --git a/manifest_64.xml b/manifest_64.xml
index d1bc1559..09466c99 100644
--- a/manifest_64.xml
+++ b/manifest_64.xml
@@ -26,15 +26,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.graphics.allocator</name>
-        <transport>hwbinder</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IAllocator</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.graphics.mapper</name>
         <transport arch="32+64">passthrough</transport>
diff --git a/radio/config/Pixel_stability.nprf b/radio/config/Pixel_stability.nprf
index 327b8f18..58148921 100644
Binary files a/radio/config/Pixel_stability.nprf and b/radio/config/Pixel_stability.nprf differ