diff --git a/device.mk b/device.mk
index bbf7439c..71dce6c2 100644
--- a/device.mk
+++ b/device.mk
@@ -19,6 +19,7 @@ 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
+include device/google/gs-common/aoc/aoc.mk
 
 TARGET_BOARD_PLATFORM := gs101
 DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false)
@@ -745,10 +746,6 @@ endif
 
 $(call soong_config_set,bigo,soc,gs101)
 
-# MFC firmware
-PRODUCT_COPY_FILES += \
-	device/google/gs101/firmware/mfc/mfc_fw.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/mfc_fw.bin
-
 # 1. Codec 2.0
 # exynos service
 PRODUCT_SOONG_NAMESPACES += vendor/samsung_slsi/codec2
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index 34b1433f..29612f2b 100644
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -259,7 +259,6 @@ DumpstateDevice::DumpstateDevice()
         { "touch", [this](int fd) { dumpTouchSection(fd); } },
         { "display", [this](int fd) { dumpDisplaySection(fd); } },
         { "sensors-usf", [this](int fd) { dumpSensorsUSFSection(fd); } },
-        { "aoc", [this](int fd) { dumpAoCSection(fd); } },
         { "misc", [this](int fd) { dumpMiscSection(fd); } },
         { "camera", [this](int fd) { dumpCameraSection(fd); } },
     } {
@@ -909,34 +908,6 @@ void DumpstateDevice::dumpDisplaySection(int fd) {
     }
 }
 
-// Dump items related to AoC
-void DumpstateDevice::dumpAoCSection(int fd) {
-    DumpFileToFd(fd, "AoC Service Status", "/sys/devices/platform/19000000.aoc/services");
-    DumpFileToFd(fd, "AoC Restarts", "/sys/devices/platform/19000000.aoc/restart_count");
-    DumpFileToFd(fd, "AoC Coredumps", "/sys/devices/platform/19000000.aoc/coredump_count");
-    DumpFileToFd(fd, "AoC ring buf wake", "/sys/devices/platform/19000000.aoc/control/ring_buffer_wakeup");
-    DumpFileToFd(fd, "AoC host ipc wake", "/sys/devices/platform/19000000.aoc/control/host_ipc_wakeup");
-    DumpFileToFd(fd, "AoC usf wake", "/sys/devices/platform/19000000.aoc/control/usf_wakeup");
-    DumpFileToFd(fd, "AoC audio wake", "/sys/devices/platform/19000000.aoc/control/audio_wakeup");
-    DumpFileToFd(fd, "AoC logging wake", "/sys/devices/platform/19000000.aoc/control/logging_wakeup");
-    DumpFileToFd(fd, "AoC hotword wake", "/sys/devices/platform/19000000.aoc/control/hotword_wakeup");
-    DumpFileToFd(fd, "AoC memory exception wake", "/sys/devices/platform/19000000.aoc/control/memory_exception");
-    DumpFileToFd(fd, "AoC memory votes", "/sys/devices/platform/19000000.aoc/control/memory_votes_a32");
-    DumpFileToFd(fd, "AoC memory votes", "/sys/devices/platform/19000000.aoc/control/memory_votes_ff1");
-    RunCommandToFd(fd, "AoC Heap Stats (A32)",
-      {"/vendor/bin/sh", "-c", "echo 'dbg heap -c 1' > /dev/acd-debug; timeout 0.1 cat /dev/acd-debug"},
-      CommandOptions::WithTimeout(1).Build());
-    RunCommandToFd(fd, "AoC Heap Stats (F1)",
-      {"/vendor/bin/sh", "-c", "echo 'dbg heap -c 2' > /dev/acd-debug; timeout 0.1 cat /dev/acd-debug"},
-      CommandOptions::WithTimeout(1).Build());
-    RunCommandToFd(fd, "AoC Heap Stats (HF0)",
-      {"/vendor/bin/sh", "-c", "echo 'dbg heap -c 3' > /dev/acd-debug; timeout 0.1 cat /dev/acd-debug"},
-      CommandOptions::WithTimeout(1).Build());
-    RunCommandToFd(fd, "AoC Heap Stats (HF1)",
-      {"/vendor/bin/sh", "-c", "echo 'dbg heap -c 4' > /dev/acd-debug; timeout 0.1 cat /dev/acd-debug"},
-      CommandOptions::WithTimeout(1).Build());
-}
-
 // Dump items related to sensors usf.
 void DumpstateDevice::dumpSensorsUSFSection(int fd) {
     CommandOptions options = CommandOptions::WithTimeout(2).Build();
diff --git a/dumpstate/DumpstateDevice.h b/dumpstate/DumpstateDevice.h
index 2247b3dc..9a8590e6 100644
--- a/dumpstate/DumpstateDevice.h
+++ b/dumpstate/DumpstateDevice.h
@@ -71,7 +71,6 @@ struct DumpstateDevice : public IDumpstateDevice {
     void dumpMemorySection(int fd);
     void dumpDisplaySection(int fd);
     void dumpSensorsUSFSection(int fd);
-    void dumpAoCSection(int fd);
     void dumpMiscSection(int fd);
     void dumpCameraSection(int fd);
 };
diff --git a/firmware/mfc/mfc_fw.bin b/firmware/mfc/mfc_fw.bin
deleted file mode 100644
index 4a5c070f..00000000
Binary files a/firmware/mfc/mfc_fw.bin and /dev/null differ
diff --git a/firmware/mfc/signed/mfc_fw.bin b/firmware/mfc/signed/mfc_fw.bin
deleted file mode 100644
index 6f60c16c..00000000
Binary files a/firmware/mfc/signed/mfc_fw.bin and /dev/null differ