diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index a07a3d73..9694debe 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -309,9 +309,6 @@ on init
     # Disable dock-defend by default
     chown system system /sys/devices/platform/google,charger/dd_settings
     write /sys/devices/platform/google,charger/dd_settings -1
-    # Enable charger mode (aka off-mode charging) by default
-    chown system system /sys/class/power_supply/battery/charger_mode
-    write /sys/class/power_supply/battery/charger_mode 1
 
     # Power Stats HAL
     chown system system /dev/bbd_pwrstat
@@ -858,14 +855,6 @@ on  property:persist.sys.test_harness=1 && property:persist.vendor.testing_batte
     setprop persist.vendor.charge.start.level 0
     setprop vendor.battery.defender.disable 1
 
-# Clear the state of charger_mode
-on property:persist.vendor.charger_mode.enable=1
-    write /sys/class/power_supply/battery/charger_mode 0
-
-# Enable charger_mode when user triggers shutdown from menu
-on property:sys.shutdown.requested=0userrequested
-    write /sys/class/power_supply/battery/charger_mode 1
-
 # on userdebug and eng builds, enable scsi error recovery log
 on property:ro.debuggable=1
     write /sys/module/scsi_mod/parameters/scsi_logging_level 63
diff --git a/media_codecs_bo_c2.xml b/media_codecs_bo_c2.xml
index 7830b9c9..b57a92aa 100644
--- a/media_codecs_bo_c2.xml
+++ b/media_codecs_bo_c2.xml
@@ -26,7 +26,8 @@
           <Limit name="bitrate" range="1-120000000" />
           <Limit name="frame-rate" range="1-120" />
           <Limit name="concurrent-instances" max="16" />
-          <Limit name="performance-point-1920x1080" value="200" />
+          <Limit name="performance-point-1920x1080" value="180" />
+          <Limit name="performance-point-1920x1079" value="120" />
           <Limit name="performance-point-3840x2160" value="60" />
           <!--Feature name="adaptive-playback" /-->
         </MediaCodec>
@@ -39,7 +40,8 @@
           <Limit name="bitrate" range="1-120000000" />
           <Limit name="frame-rate" range="1-120" />
           <Limit name="concurrent-instances" max="16" />
-          <Limit name="performance-point-1920x1080" value="200" />
+          <Limit name="performance-point-1920x1080" value="180" />
+          <Limit name="performance-point-1920x1079" value="120" />
           <Limit name="performance-point-3840x2160" value="60" />
           <!--Feature name="adaptive-playback" /-->
           <Feature name="secure-playback" required="true" />