diff --git a/conf/quick_tap.xml b/conf/quick_tap.xml
deleted file mode 100644
index 53a1c2a..0000000
--- a/conf/quick_tap.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- These are configurations that should exist on devices that support Quick
-  Tap -->
-<config>
-  <!-- This feature is meant to be the feature identifying devices that support
-    Quick Tap -->
-  <feature name="com.google.android.feature.QUICK_TAP" />
-</config>
\ No newline at end of file
diff --git a/device.mk b/device.mk
index de2e8dc..eef666a 100644
--- a/device.mk
+++ b/device.mk
@@ -27,14 +27,6 @@ PRODUCT_COPY_FILES += \
 
 # Overlay
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
-# Quick Tap
-PRODUCT_COPY_FILES += \
-    device/oneplus/guacamoleb/conf/quick_tap.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/quick_tap.xml
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
-    persist.columbus.use_ap_sensor=false
-
-PRODUCT_PACKAGES += \
-   android.hardware.sensors@1.0-service
 
 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += $(LOCAL_PATH)