diff --git a/overlay/FrameworksResTarget/res/values/config.xml b/overlay/FrameworksResTarget/res/values/config.xml
index 1642c22..88141a1 100644
--- a/overlay/FrameworksResTarget/res/values/config.xml
+++ b/overlay/FrameworksResTarget/res/values/config.xml
@@ -5,26 +5,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-    <!-- Note: This config is deprecated, use BluetoothProperties instead.
-         Idle current for bluetooth controller. 0 by default
-    -->
-    <integer name="config_bluetooth_idle_cur_ma" translatable="false">4</integer>
-
-    <!-- Note: This config is deprecated, use BluetoothProperties instead.
-         Rx current for bluetooth controller. 0 by default
-    -->
-    <integer name="config_bluetooth_rx_cur_ma" translatable="false">18</integer>
-
-    <!-- Note: This config is deprecated, use BluetoothProperties instead.
-         Tx current for bluetooth controller. 0 by default
-    -->
-    <integer name="config_bluetooth_tx_cur_ma" translatable="false">33</integer>
-
-    <!-- Note: This config is deprecated, use BluetoothProperties instead.
-         Operating volatage for bluetooth controller. 0 by default
-    -->
-    <integer name="config_bluetooth_operating_voltage_mv" translatable="false">4000</integer>
-
     <!-- Whether a software navigation bar should be shown. NOTE: in the future this may be
          autodetected from the Configuration. -->
     <bool name="config_showNavigationBar">true</bool>
diff --git a/product.prop b/product.prop
index bf1eae9..2a69658 100644
--- a/product.prop
+++ b/product.prop
@@ -6,6 +6,10 @@ audio.offload.video=true
 ro.af.client_heap_size_kbyte=7168
 
 # Bluetooth
+bluetooth.hardware.power.idle_cur_ma=4
+bluetooth.hardware.power.operating_voltage_mv=4000
+bluetooth.hardware.power.rx_cur_ma=18
+bluetooth.hardware.power.tx_cur_ma=33
 bluetooth.device.class_of_device=90,2,12
 bluetooth.profile.a2dp.source.enabled=true
 bluetooth.profile.asha.central.enabled=true