diff --git a/aoc/conf/init.aoc.daemon.rc b/aoc/conf/init.aoc.daemon.rc
deleted file mode 100644
index 1cf204e1..00000000
--- a/aoc/conf/init.aoc.daemon.rc
+++ /dev/null
@@ -1 +0,0 @@
-# AoC firmware will be loaded by Daemon
\ No newline at end of file
diff --git a/aoc/conf/init.aoc.nodaemon.rc b/aoc/conf/init.aoc.nodaemon.rc
deleted file mode 100644
index 329d7d34..00000000
--- a/aoc/conf/init.aoc.nodaemon.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-# Load AoC firmware and boot
-on property:vendor.all.modules.ready=1
-    write /sys/devices/platform/19000000.aoc/firmware aoc.bin
\ No newline at end of file
diff --git a/aoc/device.mk b/aoc/device.mk
deleted file mode 100644
index 4ee8b4c6..00000000
--- a/aoc/device.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-PRODUCT_PACKAGES += \
-	aocd
-
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/zuma-sepolicy/aoc
-
-ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
-# IAudioMetricExt HIDL
-PRODUCT_PACKAGES += \
-    vendor.google.audiometricext@1.0-service-vendor
-endif
-
-# If AoC Daemon is not present on this build, load firmware at boot via rc
-ifeq ($(wildcard vendor/google/whitechapel/aoc/aocd),)
-PRODUCT_COPY_FILES += \
-	device/google/zuma/aoc/conf/init.aoc.nodaemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.aoc.rc
-else
-PRODUCT_COPY_FILES += \
-	device/google/zuma/aoc/conf/init.aoc.daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.aoc.rc
-endif
-
-# AoC debug support
-PRODUCT_PACKAGES_DEBUG += \
-	aocdump \
-	aocutil \
-	aoc_audio_cfg \
-	vp_util
diff --git a/device.mk b/device.mk
index f2dffad6..1a48a595 100644
--- a/device.mk
+++ b/device.mk
@@ -435,9 +435,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
 	android.hardware.dumpstate-service.zuma
 
-# AoC support
-include device/google/zuma/aoc/device.mk
-
 #
 # Audio HALs
 #