diff --git a/device.mk b/device.mk
index 7e0a7b06..f4ad6789 100644
--- a/device.mk
+++ b/device.mk
@@ -22,6 +22,7 @@ include device/google/gs-common/modem/modem.mk
 include device/google/gs-common/aoc/aoc.mk
 include device/google/gs-common/thermal/thermal.mk
 include device/google/gs-common/pixel_metrics/pixel_metrics.mk
+include device/google/gs-common/performance/perf.mk
 
 TARGET_BOARD_PLATFORM := gs101
 DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false)
diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp
index a4fcfeae..a77cc323 100644
--- a/dumpstate/Dumpstate.cpp
+++ b/dumpstate/Dumpstate.cpp
@@ -239,24 +239,12 @@ void endSection(int fd, const std::string &sectionName, timepoint_t startTime) {
             "\n", fd);
 }
 
-// If you are adding a single RunCommandToFd() or DumpFileToFd() call, please
-// add it to dumpMiscSection().  But if you are adding multiple items that are
-// related to each other - for instance, for a Foo peripheral - please add them
-// to a new dump function and include it in this table so it can be accessed from the
-// command line, e.g.:
-//   dumpsys android.hardware.dumpstate.IDumpstateDevice/default foo
-//
-// However, if your addition generates attachments and/or binary data for the
-// bugreport (i.e. if it requires two file descriptors to execute), it must not be
-// added to this table and should instead be added to dumpstateBoard() below.
-
 Dumpstate::Dumpstate()
   : mTextSections{
         { "memory", [this](int fd) { dumpMemorySection(fd); } },
         { "Devfreq", [this](int fd) { dumpDevfreqSection(fd); } },
         { "power", [this](int fd) { dumpPowerSection(fd); } },
         { "display", [this](int fd) { dumpDisplaySection(fd); } },
-        { "misc", [this](int fd) { dumpMiscSection(fd); } },
         { "camera", [this](int fd) { dumpCameraSection(fd); } },
     } {
 }
@@ -305,6 +293,7 @@ void Dumpstate::dumpTextSection(int fd, const std::string &sectionName) {
     }
 
     if (dumpAll) {
+        RunCommandToFd(fd, "VENDOR PROPERTIES", {"/vendor/bin/getprop"});
         return;
     }
 
@@ -593,12 +582,6 @@ void Dumpstate::dumpDisplaySection(int fd) {
     }
 }
 
-// Dump items that don't fit well into any other section
-void Dumpstate::dumpMiscSection(int fd) {
-    RunCommandToFd(fd, "VENDOR PROPERTIES", {"/vendor/bin/getprop"});
-    DumpFileToFd(fd, "VENDOR PROC DUMP", "/proc/vendor_sched/dump_task");
-}
-
 // Dump essential camera debugging logs
 void Dumpstate::dumpCameraSection(int fd) {
     RunCommandToFd(fd, "Camera HAL Graph State Dump", {"/vendor/bin/sh", "-c",
diff --git a/dumpstate/Dumpstate.h b/dumpstate/Dumpstate.h
index 384610bc..a2cbfd75 100644
--- a/dumpstate/Dumpstate.h
+++ b/dumpstate/Dumpstate.h
@@ -51,7 +51,6 @@ class Dumpstate : public BnDumpstateDevice {
     void dumpDevfreqSection(int fd);
     void dumpMemorySection(int fd);
     void dumpDisplaySection(int fd);
-    void dumpMiscSection(int fd);
     void dumpCameraSection(int fd);
 };