diff --git a/device-caiman.mk b/device-caiman.mk
index 2f59421a..1adb88f3 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -478,13 +478,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.thread_dispatcher.enabled=true
 
-# Thread HAL & demo app
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PACKAGES += \
-   com.google.caimito.hardware.threadnetwork \
-   ThreadNetworkDemoApp
-endif
-
 # Bluetooth device id
 # Caiman: 0x4110
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/device-komodo.mk b/device-komodo.mk
index 9ac96c71..af40e235 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -479,13 +479,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.thread_dispatcher.enabled=true
 
-# Thread HAL
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PACKAGES += \
-   com.google.caimito.hardware.threadnetwork \
-   ThreadNetworkDemoApp
-endif
-
 # Bluetooth device id
 # Komodo: 0x4111
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/device-tokay.mk b/device-tokay.mk
index 7e1b95d0..7a0fa41e 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -444,13 +444,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.thread_dispatcher.enabled=true
 
-# Thread HAL
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PACKAGES += \
-   com.google.caimito.hardware.threadnetwork \
-   ThreadNetworkDemoApp
-endif
-
 # Bluetooth device id
 # Tokay: 0x4112
 PRODUCT_PRODUCT_PROPERTIES += \