diff --git a/ambient/AmbientSensePrebuilt.apk b/ambient/AmbientSensePrebuilt.apk
deleted file mode 100644
index 57fb3ef..0000000
Binary files a/ambient/AmbientSensePrebuilt.apk and /dev/null differ
diff --git a/ambient/Android.mk b/ambient/Android.mk
deleted file mode 100644
index 7148cf9..0000000
--- a/ambient/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := AmbientSensePrebuilt
-LOCAL_MODULE_OWNER := google
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_DEX_PREOPT := false
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-include $(BUILD_PREBUILT)
diff --git a/ambient/etc/ambient/matcher_tah.leveldb b/ambient/etc/ambient/matcher_tah.leveldb
deleted file mode 100644
index 2435e6c..0000000
Binary files a/ambient/etc/ambient/matcher_tah.leveldb and /dev/null differ
diff --git a/ambient/etc/firmware/dnd.descriptor b/ambient/etc/firmware/dnd.descriptor
deleted file mode 100644
index e708a5d..0000000
Binary files a/ambient/etc/firmware/dnd.descriptor and /dev/null differ
diff --git a/ambient/etc/firmware/dnd.sound_model b/ambient/etc/firmware/dnd.sound_model
deleted file mode 100644
index 617e368..0000000
Binary files a/ambient/etc/firmware/dnd.sound_model and /dev/null differ
diff --git a/ambient/etc/firmware/music_detector.descriptor b/ambient/etc/firmware/music_detector.descriptor
deleted file mode 100644
index dabc7bb..0000000
Binary files a/ambient/etc/firmware/music_detector.descriptor and /dev/null differ
diff --git a/ambient/etc/firmware/music_detector.sound_model b/ambient/etc/firmware/music_detector.sound_model
deleted file mode 100644
index dbdb31c..0000000
Binary files a/ambient/etc/firmware/music_detector.sound_model and /dev/null differ
diff --git a/ambient/etc/permissions/AmbientSensePrebuilt.xml b/ambient/etc/permissions/AmbientSensePrebuilt.xml
deleted file mode 100644
index 1364d27..0000000
--- a/ambient/etc/permissions/AmbientSensePrebuilt.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 CarbonROM
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<!--
-This XML file declares which signature|privileged permissions should be granted to AmbientSensePrebuilt
--->
-<permissions>
-    <privapp-permissions package="com.google.intelligence.sense">
-        <permission name="android.permission.CAPTURE_AUDIO_HOTWORD"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.LOCATION_HARDWARE"/>
-        <permission name="android.permission.MANAGE_SOUND_TRIGGER"/>
-        <permission name="android.permission.RECORD_AUDIO"/>
-        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-</permissions>
-
diff --git a/gapps.mk b/gapps.mk
index cd54e39..c7d7c20 100644
--- a/gapps.mk
+++ b/gapps.mk
@@ -5,31 +5,3 @@ GAPPS_FORCE_PACKAGE_OVERRIDES := true
 GAPPS_FORCE_PIXEL_LAUNCHER := true
 
 $(call inherit-product-if-exists, vendor/opengapps/build/opengapps-packages.mk)
-
-GAPPS_PIXEL2017_CODENAMES += \
-    %muskie \
-    %taimen \
-    %wahoo \
-    %walleye
-
-GAPPS_PIXEL2018_CODENAMES += \
-    %albacore \
-    %blueline \
-    %crosshatch
-
-GAPPS_PIXEL_AMBIENT_CODENAMES += \
-    $(GAPPS_PIXEL2017_CODENAMES) \
-    $(GAPPS_PIXEL2018_CODENAMES)
-
-# Build ambient listening on Pixel 2017 and Pixel 2018 devices
-ifneq ($(filter $(GAPPS_PIXEL_AMBIENT_CODENAMES),$(TARGET_PRODUCT)),)
-PRODUCT_PACKAGES += AmbientSensePrebuilt
-
-PRODUCT_COPY_FILES += \
-    vendor/extra/ambient/etc/ambient/matcher_tah.leveldb:system/etc/ambient/matcher_tah.leveldb \
-    vendor/extra/ambient/etc/firmware/dnd.descriptor:system/etc/firmware/dnd.descriptor \
-    vendor/extra/ambient/etc/firmware/dnd.sound_model:system/etc/firmware/dnd.sound_model \
-    vendor/extra/ambient/etc/firmware/music_detector.descriptor:system/etc/firmware/music_detector.descriptor \
-    vendor/extra/ambient/etc/firmware/music_detector.sound_model:system/etc/firmware/music_detector.sound_model \
-    vendor/extra/ambient/etc/permissions/AmbientSensePrebuilt.xml:system/etc/permissions/AmbientSensePrebuilt.xml
-endif