diff --git a/device.mk b/device.mk
index 77844d55..98e8bb0f 100644
--- a/device.mk
+++ b/device.mk
@@ -18,6 +18,7 @@ include device/google/gs-common/device.mk
 include device/google/gs-common/gs_watchdogd/watchdog.mk
 include device/google/gs-common/ramdump/ramdump.mk
 include device/google/gs-common/soc/soc.mk
+include device/google/gs-common/modem/modem.mk
 
 TARGET_BOARD_PLATFORM := gs201
 
diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp
index bae83d3a..610d7540 100644
--- a/dumpstate/Dumpstate.cpp
+++ b/dumpstate/Dumpstate.cpp
@@ -222,7 +222,6 @@ void endSection(int fd, const std::string &sectionName, timepoint_t startTime) {
 Dumpstate::Dumpstate()
   : mTextSections{
         { "wlan", [this](int fd) { dumpWlanSection(fd); } },
-        { "modem", [this](int fd) { dumpModemSection(fd); } },
         { "memory", [this](int fd) { dumpMemorySection(fd); } },
         { "Devfreq", [this](int fd) { dumpDevfreqSection(fd); } },
         { "cpu", [this](int fd) { dumpCpuSection(fd); } },
@@ -1045,18 +1044,6 @@ void Dumpstate::dumpLEDSection(int fd) {
     }
 }
 
-void Dumpstate::dumpModemSection(int fd) {
-    DumpFileToFd(fd, "Modem Stat", "/data/vendor/modem_stat/debug.txt");
-    RunCommandToFd(fd, "Modem SSR history", {"/vendor/bin/sh", "-c",
-                       "for f in $(ls /data/vendor/ssrdump/crashinfo_modem*); do "
-                       "echo $f ; cat $f ; done"},
-                       CommandOptions::WithTimeout(2).Build());
-    RunCommandToFd(fd, "RFSD error log", {"/vendor/bin/sh", "-c",
-                       "for f in $(ls /data/vendor/log/rfsd/rfslog_*); do "
-                       "echo $f ; cat $f ; done"},
-                       CommandOptions::WithTimeout(2).Build());
-}
-
 void Dumpstate::dumpModemLogs(int fd, const std::string &destDir) {
     std::string extendedLogDir = MODEM_EXTENDED_LOG_DIRECTORY;
 
diff --git a/dumpstate/Dumpstate.h b/dumpstate/Dumpstate.h
index ac176c3c..77a36ec3 100644
--- a/dumpstate/Dumpstate.h
+++ b/dumpstate/Dumpstate.h
@@ -53,7 +53,6 @@ class Dumpstate : public BnDumpstateDevice {
     // Text sections that can be dumped individually on the command line in
     // addition to being included in full dumps
     void dumpWlanSection(int fd);
-    void dumpModemSection(int fd);
     void dumpPowerSection(int fd);
     void dumpThermalSection(int fd);
     void dumpTouchSection(int fd);