diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index 15601204..028db4b6 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -1,3 +1,4 @@
+import /vendor/etc/init/hw/init.gs201.storage.rc
 import /vendor/etc/init/hw/init.gs201.usb.rc
 import android.hardware.drm@1.2-service.widevine.rc
 import init.exynos.sensorhub.rc
diff --git a/conf/init.modem.rc b/conf/init.modem.rc
index 6c89e3b2..861f0a18 100644
--- a/conf/init.modem.rc
+++ b/conf/init.modem.rc
@@ -11,7 +11,7 @@ on post-fs-data
     mkdir /data/vendor/slog 0771 system system
 
     # Modem extended log folder
-    mkdir /data/vendor/radio/extended_logs 0770 radio system
+    mkdir /data/vendor/radio/extended_logs 0771 radio system
 
     # Modem MDS log folder
     mkdir /data/vendor/radio/mds 0771 radio system
diff --git a/device.mk b/device.mk
index 726de305..95b4fc28 100644
--- a/device.mk
+++ b/device.mk
@@ -356,6 +356,14 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
 	device/google/gs201/conf/init.gs201.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs201.rc
 
+ifneq (,$(filter 5.%, $(TARGET_LINUX_KERNEL_VERSION)))
+PRODUCT_COPY_FILES += \
+	device/google/gs201/storage/5.10/init.gs201.storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs201.storage.rc
+else
+PRODUCT_COPY_FILES += \
+	device/google/gs201/storage/6.1/init.gs201.storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs201.storage.rc
+endif
+
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_COPY_FILES += \
 	device/google/gs201/conf/init.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.debug.rc \
diff --git a/dumpstate/dump_power.cpp b/dumpstate/dump_power.cpp
index 1841502b..adb6c9b5 100644
--- a/dumpstate/dump_power.cpp
+++ b/dumpstate/dump_power.cpp
@@ -117,7 +117,6 @@ void dumpAcpmStats() {
 void dumpPowerSupplyStats() {
     const char* dumpList[][2] = {
             {"CPU PM stats", "/sys/devices/system/cpu/cpupm/cpupm/time_in_state"},
-            {"GENPD summary", "/d/pm_genpd/pm_genpd_summary"},
             {"Power supply property battery", "/sys/class/power_supply/battery/uevent"},
             {"Power supply property dc", "/sys/class/power_supply/dc/uevent"},
             {"Power supply property gcpm", "/sys/class/power_supply/gcpm/uevent"},
@@ -292,53 +291,6 @@ void dumpBatteryDefend() {
         files.clear();
     }
 }
-void dumpChgUserDebug() {
-    std::vector<std::string> files;
-    struct dirent *entry;
-    std::string content;
-    const char *chgUserDebug [][2] {
-            {"DC_registers dump", "/sys/class/power_supply/dc-mains/device/registers_dump"},
-            {"max77759_chg registers dump", "/d/max77759_chg/registers"},
-            {"max77729_pmic registers dump", "/d/max77729_pmic/registers"},
-            {"Charging table dump", "/d/google_battery/chg_raw_profile"},
-    };
-    const std::string debugfs = "/d/";
-    const char *maxFgStrMatch = "maxfg";
-    const char *fgInfo [][2] {
-            {"fg_model", "fg_model"},
-            {"fg_alo_ver", "algo_ver"},
-            {"fg_model_ok", "model_ok"},
-            {"fg registers", "registers"},
-            {"Maxim FG NV RAM", "nv_registers"},
-    };
-    if (!isUserBuild())
-        return;
-    for (auto &row : chgUserDebug) {
-        dumpFileContent(row[0], row[1]);
-    }
-    for (auto &info : fgInfo) {
-        DIR *dir = opendir(debugfs.c_str());
-        if (dir == NULL)
-            return;
-        printTitle(info[0]);
-        while ((entry = readdir(dir)) != NULL)
-            if (std::string(entry->d_name).find(maxFgStrMatch) != std::string::npos)
-                files.push_back(entry->d_name);
-        closedir(dir);
-        sort(files.begin(), files.end());
-        for (auto &file : files) {
-            std::string fileDirectory = debugfs + file;
-            std::string fileLocation = fileDirectory + "/" + std::string(info[1]);
-            if (!android::base::ReadFileToString(fileLocation, &content)) {
-                content = "\n";
-            }
-            printf("%s:\n%s", fileDirectory.c_str(), content.c_str());
-            if (content.back() != '\n')
-                printf("\n");
-        }
-        files.clear();
-    }
-}
 void dumpBatteryEeprom() {
     const char *title = "Battery EEPROM";
     const char *files[] {
@@ -710,7 +662,6 @@ int main() {
     dumpLn8411();
     dumpBatteryHealth();
     dumpBatteryDefend();
-    dumpChgUserDebug();
     dumpBatteryEeprom();
     dumpChargerStats();
     dumpWlcLogs();
diff --git a/storage/5.10/init.gs201.storage.rc b/storage/5.10/init.gs201.storage.rc
new file mode 100644
index 00000000..7df260de
--- /dev/null
+++ b/storage/5.10/init.gs201.storage.rc
@@ -0,0 +1,3 @@
+on init
+    write /sys/block/sda/queue/scheduler bfq
+    write /sys/block/sda/queue/iosched/slice_idle 0
\ No newline at end of file
diff --git a/storage/6.1/init.gs201.storage.rc b/storage/6.1/init.gs201.storage.rc
new file mode 100644
index 00000000..3d88bb69
--- /dev/null
+++ b/storage/6.1/init.gs201.storage.rc
@@ -0,0 +1,2 @@
+on init
+    write /sys/block/sda/queue/scheduler mq-deadline
\ No newline at end of file