diff --git a/power-libperfmgr/aidl/android.hardware.power-service.xiaomi_sdm660-libperfmgr.rc b/power-libperfmgr/aidl/android.hardware.power-service.xiaomi_sdm660-libperfmgr.rc
index 1950feba..d3271079 100644
--- a/power-libperfmgr/aidl/android.hardware.power-service.xiaomi_sdm660-libperfmgr.rc
+++ b/power-libperfmgr/aidl/android.hardware.power-service.xiaomi_sdm660-libperfmgr.rc
@@ -19,15 +19,6 @@ on property:init.svc.vendor.audio-hal-2-0=restarting && property:vendor.powerhal
     setprop vendor.powerhal.audio ""
     restart vendor.power-hal-aidl
 
-# Clean up after b/163539793 resolved
-on property:vendor.powerhal.dalvik.vm.dex2oat-threads=*
-    setprop dalvik.vm.dex2oat-threads ${vendor.powerhal.dalvik.vm.dex2oat-threads}
-    setprop dalvik.vm.restore-dex2oat-threads ${vendor.powerhal.dalvik.vm.dex2oat-threads}
-
-on property:vendor.powerhal.dalvik.vm.dex2oat-cpu-set=*
-    setprop dalvik.vm.dex2oat-cpu-set ${vendor.powerhal.dalvik.vm.dex2oat-cpu-set}
-    setprop dalvik.vm.restore-dex2oat-cpu-set ${vendor.powerhal.dalvik.vm.dex2oat-cpu-set}
-
 # initialize powerHAL when boot is completed
 on property:sys.boot_completed=1
     setprop vendor.powerhal.init 1
diff --git a/power-libperfmgr/sdm660_powerhint.json b/power-libperfmgr/sdm660_powerhint.json
index a205e19a..a9b5fb93 100644
--- a/power-libperfmgr/sdm660_powerhint.json
+++ b/power-libperfmgr/sdm660_powerhint.json
@@ -238,28 +238,6 @@
         ""
       ],
       "Type": "Property"
-    },
-    {
-      "Name": "Dex2oatThreads",
-      "Path": "vendor.powerhal.dalvik.vm.dex2oat-threads",
-      "Values": [
-          "1",
-          "2",
-          "4",
-          "6"
-      ],
-      "Type": "Property"
-    },
-    {
-      "Name": "Dex2oatCPUSet",
-      "Path": "vendor.powerhal.dalvik.vm.dex2oat-cpu-set",
-      "Values": [
-          "2,3",
-          "0,1,2,3",
-          "0,1,2,3,4,5",
-          "0,1,2,3,4,5,6,7"
-      ],
-      "Type": "Property"
     }
   ],
   "Actions": [
@@ -503,66 +481,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "THERMAL_fps-therm-monitor_LIGHT",
-      "Node": "Dex2oatThreads",
-      "Duration": 0,
-      "Value": "4"
-    },
-    {
-      "PowerHint": "THERMAL_fps-therm-monitor_LIGHT",
-      "Node": "Dex2oatCPUSet",
-      "Duration": 0,
-      "Value": "0,1,2,3,4,5"
-    },
-    {
-      "PowerHint": "THERMAL_fps-therm-monitor_MODERATE",
-      "Node": "Dex2oatThreads",
-      "Duration": 0,
-      "Value": "2"
-    },
-    {
-      "PowerHint": "THERMAL_fps-therm-monitor_MODERATE",
-      "Node": "Dex2oatCPUSet",
-      "Duration": 0,
-      "Value": "0,1,2,3"
-    },
-    {
-      "PowerHint": "THERMAL_fps-therm-monitor_SEVERE",
-      "Node": "Dex2oatThreads",
-      "Duration": 0,
-      "Value": "1"
-    },
-    {
-      "PowerHint": "THERMAL_fps-therm-monitor_SEVERE",
-      "Node": "Dex2oatCPUSet",
-      "Duration": 0,
-      "Value": "2,3"
-    },
-    {
-      "PowerHint": "THERMAL_fps-therm-monitor_CRITICAL",
-      "Node": "Dex2oatThreads",
-      "Duration": 0,
-      "Value": "1"
-    },
-    {
-      "PowerHint": "THERMAL_fps-therm-monitor_CRITICAL",
-      "Node": "Dex2oatCPUSet",
-      "Duration": 0,
-      "Value": "2,3"
-    },
-    {
-      "PowerHint": "THERMAL_fps-therm-monitor_EMERGENCY",
-      "Node": "Dex2oatThreads",
-      "Duration": 0,
-      "Value": "1"
-    },
-    {
-      "PowerHint": "THERMAL_fps-therm-monitor_EMERGENCY",
-      "Node": "Dex2oatCPUSet",
-      "Duration": 0,
-      "Value": "2,3"
-    },
     {
       "PowerHint": "LOW_POWER",
       "Node": "KernelBatterySaver",