diff --git a/device-tegu.mk b/device-tegu.mk
index d510f66..93271aa 100644
--- a/device-tegu.mk
+++ b/device-tegu.mk
@@ -33,18 +33,10 @@ TARGET_KERNEL_DIR ?= device/google/tegu-kernels/6.1/25D4
 TARGET_BOARD_KERNEL_HEADERS ?= device/google/tegu-kernels/6.1/25D4/kernel-headers
 endif
 
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-    USE_UWBFIELDTESTQM := true
-endif
-ifeq ($(filter factory_tegu, $(TARGET_PRODUCT)),)
-    include device/google/tegu/uwb/uwb_calibration.mk
-endif
-
 $(call inherit-product-if-exists, vendor/google_devices/tegu/prebuilts/device-vendor-tegu.mk)
 $(call inherit-product-if-exists, vendor/google_devices/zumapro/prebuilts/device-vendor.mk)
 $(call inherit-product-if-exists, vendor/google_devices/zumapro/proprietary/device-vendor.mk)
 $(call inherit-product-if-exists, vendor/google_devices/tegu/proprietary/tegu/device-vendor-tegu.mk)
-$(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
 
 # display
 DEVICE_PACKAGE_OVERLAYS += device/google/tegu/tegu/overlay
@@ -282,10 +274,6 @@ PRODUCT_PACKAGES += \
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tegu/prebuilts
 
-# UWB
-PRODUCT_SOONG_NAMESPACES += \
-    device/google/tegu/uwb
-
 # Location
 include device/google/tegu/location/device-gnss.mk
 # For GPS property
diff --git a/uwb/Android.bp b/uwb/Android.bp
deleted file mode 100644
index de2da1f..0000000
--- a/uwb/Android.bp
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// Copyright (C) 2021 The Android Open-Source Project
-//
-// 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.
-
-soong_namespace {}
-
-prebuilt_defaults {
-    name: "conf_defaults",
-    vendor: true,
-    sub_dir: "uwb",
-}
-
-prebuilt_etc {
-    name: "configuration.conf",
-    src: "configuration.conf",
-    defaults: ["conf_defaults"],
-}
-
-prebuilt_etc {
-    name: "calibration.conf",
-    src: "calibration.conf",
-    defaults: ["conf_defaults"],
-}
-
-prebuilt_etc {
-    name: "calibration-default.conf",
-    src: "calibration-default.conf",
-    defaults: ["conf_defaults"],
-}
-
-prebuilt_etc {
-    name: "calibration-CE.conf",
-    src: "calibration-CE.conf",
-    defaults: ["conf_defaults"],
-}
-
-prebuilt_etc {
-    name: "calibration-FCC.conf",
-    src: "calibration-FCC.conf",
-    defaults: ["conf_defaults"],
-}
-
-prebuilt_etc {
-    name: "calibration-JP.conf",
-    src: "calibration-JP.conf",
-    defaults: ["conf_defaults"],
-}
-
-prebuilt_etc {
-    name: "calibration-TW.conf",
-    src: "calibration-TW.conf",
-    defaults: ["conf_defaults"],
-}
-
-prebuilt_etc {
-    name: "calibration-RESTRICTED.conf",
-    src: "calibration-RESTRICTED.conf",
-    defaults: ["conf_defaults"],
-}
-
diff --git a/uwb/calibration-CE.conf b/uwb/calibration-CE.conf
deleted file mode 100644
index 385bc55..0000000
--- a/uwb/calibration-CE.conf
+++ /dev/null
@@ -1,73 +0,0 @@
-# CE calibration file
-
-ant2.ch5.ref_frame0.tx_power_index=08:08:08:08
-ant2.ch5.ref_frame0.post_tx_power_index=0xff
-ant2.ch5.ref_frame1.tx_power_index=08:08:08:08
-ant2.ch5.ref_frame1.post_tx_power_index=0xff
-ant2.ch5.ref_frame2.tx_power_index=08:08:08:08
-ant2.ch5.ref_frame2.post_tx_power_index=0xff
-ant2.ch5.ref_frame3.tx_power_index=08:08:08:08
-ant2.ch5.ref_frame3.post_tx_power_index=0xff
-ant2.ch5.ref_frame4.tx_power_index=08:08:08:08
-ant2.ch5.ref_frame4.post_tx_power_index=0xff
-ant2.ch5.ref_frame5.tx_power_index=08:08:08:08
-ant2.ch5.ref_frame5.post_tx_power_index=0xff
-ant2.ch5.ref_frame6.tx_power_index=08:08:08:08
-ant2.ch5.ref_frame6.post_tx_power_index=0xff
-ant2.ch5.ref_frame7.tx_power_index=08:08:08:08
-ant2.ch5.ref_frame7.post_tx_power_index=0xff
-
-ant2.ch9.ref_frame0.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame0.post_tx_power_index=0xff
-ant2.ch9.ref_frame1.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame1.post_tx_power_index=0xff
-ant2.ch9.ref_frame2.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame2.post_tx_power_index=0xff
-ant2.ch9.ref_frame3.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame3.post_tx_power_index=0xff
-ant2.ch9.ref_frame4.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame4.post_tx_power_index=0xff
-ant2.ch9.ref_frame5.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame5.post_tx_power_index=0xff
-ant2.ch9.ref_frame6.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame6.post_tx_power_index=0xff
-ant2.ch9.ref_frame7.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame7.post_tx_power_index=0xff
-
-ant3.ch5.ref_frame0.tx_power_index=08:08:08:08
-ant3.ch5.ref_frame0.post_tx_power_index=0xff
-ant3.ch5.ref_frame1.tx_power_index=08:08:08:08
-ant3.ch5.ref_frame1.post_tx_power_index=0xff
-ant3.ch5.ref_frame2.tx_power_index=08:08:08:08
-ant3.ch5.ref_frame2.post_tx_power_index=0xff
-ant3.ch5.ref_frame3.tx_power_index=08:08:08:08
-ant3.ch5.ref_frame3.post_tx_power_index=0xff
-ant3.ch5.ref_frame4.tx_power_index=08:08:08:08
-ant3.ch5.ref_frame4.post_tx_power_index=0xff
-ant3.ch5.ref_frame5.tx_power_index=08:08:08:08
-ant3.ch5.ref_frame5.post_tx_power_index=0xff
-ant3.ch5.ref_frame6.tx_power_index=08:08:08:08
-ant3.ch5.ref_frame6.post_tx_power_index=0xff
-ant3.ch5.ref_frame7.tx_power_index=08:08:08:08
-ant3.ch5.ref_frame7.post_tx_power_index=0xff
-
-ant3.ch9.ref_frame0.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame0.post_tx_power_index=0xff
-ant3.ch9.ref_frame1.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame1.post_tx_power_index=0xff
-ant3.ch9.ref_frame2.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame2.post_tx_power_index=0xff
-ant3.ch9.ref_frame3.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame3.post_tx_power_index=0xff
-ant3.ch9.ref_frame4.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame4.post_tx_power_index=0xff
-ant3.ch9.ref_frame5.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame5.post_tx_power_index=0xff
-ant3.ch9.ref_frame6.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame6.post_tx_power_index=0xff
-ant3.ch9.ref_frame7.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame7.post_tx_power_index=0xff
-
-
-restricted_channels=0x0000
-alternate_pulse_shape=0x00
diff --git a/uwb/calibration-FCC.conf b/uwb/calibration-FCC.conf
deleted file mode 100644
index 616f91e..0000000
--- a/uwb/calibration-FCC.conf
+++ /dev/null
@@ -1,73 +0,0 @@
-# FCC calibration file
-
-ant2.ch5.ref_frame0.tx_power_index=08:08:08:08
-ant2.ch5.ref_frame0.post_tx_power_index=0xff
-ant2.ch5.ref_frame1.tx_power_index=08:08:08:08
-ant2.ch5.ref_frame1.post_tx_power_index=0xff
-ant2.ch5.ref_frame2.tx_power_index=08:08:08:08
-ant2.ch5.ref_frame2.post_tx_power_index=0xff
-ant2.ch5.ref_frame3.tx_power_index=08:08:08:08
-ant2.ch5.ref_frame3.post_tx_power_index=0xff
-ant2.ch5.ref_frame4.tx_power_index=08:08:08:08
-ant2.ch5.ref_frame4.post_tx_power_index=0xff
-ant2.ch5.ref_frame5.tx_power_index=08:08:08:08
-ant2.ch5.ref_frame5.post_tx_power_index=0xff
-ant2.ch5.ref_frame6.tx_power_index=08:08:08:08
-ant2.ch5.ref_frame6.post_tx_power_index=0xff
-ant2.ch5.ref_frame7.tx_power_index=08:08:08:08
-ant2.ch5.ref_frame7.post_tx_power_index=0xff
-
-ant2.ch9.ref_frame0.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame0.post_tx_power_index=0xff
-ant2.ch9.ref_frame1.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame1.post_tx_power_index=0xff
-ant2.ch9.ref_frame2.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame2.post_tx_power_index=0xff
-ant2.ch9.ref_frame3.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame3.post_tx_power_index=0xff
-ant2.ch9.ref_frame4.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame4.post_tx_power_index=0xff
-ant2.ch9.ref_frame5.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame5.post_tx_power_index=0xff
-ant2.ch9.ref_frame6.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame6.post_tx_power_index=0xff
-ant2.ch9.ref_frame7.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame7.post_tx_power_index=0xff
-
-ant3.ch5.ref_frame0.tx_power_index=08:08:08:08
-ant3.ch5.ref_frame0.post_tx_power_index=0xff
-ant3.ch5.ref_frame1.tx_power_index=08:08:08:08
-ant3.ch5.ref_frame1.post_tx_power_index=0xff
-ant3.ch5.ref_frame2.tx_power_index=08:08:08:08
-ant3.ch5.ref_frame2.post_tx_power_index=0xff
-ant3.ch5.ref_frame3.tx_power_index=08:08:08:08
-ant3.ch5.ref_frame3.post_tx_power_index=0xff
-ant3.ch5.ref_frame4.tx_power_index=08:08:08:08
-ant3.ch5.ref_frame4.post_tx_power_index=0xff
-ant3.ch5.ref_frame5.tx_power_index=08:08:08:08
-ant3.ch5.ref_frame5.post_tx_power_index=0xff
-ant3.ch5.ref_frame6.tx_power_index=08:08:08:08
-ant3.ch5.ref_frame6.post_tx_power_index=0xff
-ant3.ch5.ref_frame7.tx_power_index=08:08:08:08
-ant3.ch5.ref_frame7.post_tx_power_index=0xff
-
-ant3.ch9.ref_frame0.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame0.post_tx_power_index=0xff
-ant3.ch9.ref_frame1.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame1.post_tx_power_index=0xff
-ant3.ch9.ref_frame2.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame2.post_tx_power_index=0xff
-ant3.ch9.ref_frame3.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame3.post_tx_power_index=0xff
-ant3.ch9.ref_frame4.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame4.post_tx_power_index=0xff
-ant3.ch9.ref_frame5.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame5.post_tx_power_index=0xff
-ant3.ch9.ref_frame6.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame6.post_tx_power_index=0xff
-ant3.ch9.ref_frame7.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame7.post_tx_power_index=0xff
-
-
-restricted_channels=0x0000
-alternate_pulse_shape=0x00
diff --git a/uwb/calibration-JP.conf b/uwb/calibration-JP.conf
deleted file mode 100644
index c2ffed0..0000000
--- a/uwb/calibration-JP.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-# JP calibration file
-
-ant2.ch9.ref_frame0.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame0.post_tx_power_index=0xff
-ant2.ch9.ref_frame1.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame1.post_tx_power_index=0xff
-ant2.ch9.ref_frame2.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame2.post_tx_power_index=0xff
-ant2.ch9.ref_frame3.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame3.post_tx_power_index=0xff
-ant2.ch9.ref_frame4.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame4.post_tx_power_index=0xff
-ant2.ch9.ref_frame5.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame5.post_tx_power_index=0xff
-ant2.ch9.ref_frame6.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame6.post_tx_power_index=0xff
-ant2.ch9.ref_frame7.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame7.post_tx_power_index=0xff
-
-ant3.ch9.ref_frame0.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame0.post_tx_power_index=0xff
-ant3.ch9.ref_frame1.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame1.post_tx_power_index=0xff
-ant3.ch9.ref_frame2.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame2.post_tx_power_index=0xff
-ant3.ch9.ref_frame3.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame3.post_tx_power_index=0xff
-ant3.ch9.ref_frame4.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame4.post_tx_power_index=0xff
-ant3.ch9.ref_frame5.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame5.post_tx_power_index=0xff
-ant3.ch9.ref_frame6.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame6.post_tx_power_index=0xff
-ant3.ch9.ref_frame7.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame7.post_tx_power_index=0xff
-
-
-restricted_channels=0x0020
-alternate_pulse_shape=0x01
diff --git a/uwb/calibration-RESTRICTED.conf b/uwb/calibration-RESTRICTED.conf
deleted file mode 100644
index 64363e5..0000000
--- a/uwb/calibration-RESTRICTED.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# RESTRICTED calibration file, UWB disabled
-
-restricted_channels=0xFFFF
diff --git a/uwb/calibration-TW.conf b/uwb/calibration-TW.conf
deleted file mode 100644
index 4036c35..0000000
--- a/uwb/calibration-TW.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-# FCC calibration file
-
-ant2.ch9.ref_frame0.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame0.post_tx_power_index=0xff
-ant2.ch9.ref_frame1.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame1.post_tx_power_index=0xff
-ant2.ch9.ref_frame2.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame2.post_tx_power_index=0xff
-ant2.ch9.ref_frame3.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame3.post_tx_power_index=0xff
-ant2.ch9.ref_frame4.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame4.post_tx_power_index=0xff
-ant2.ch9.ref_frame5.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame5.post_tx_power_index=0xff
-ant2.ch9.ref_frame6.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame6.post_tx_power_index=0xff
-ant2.ch9.ref_frame7.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame7.post_tx_power_index=0xff
-
-ant3.ch9.ref_frame0.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame0.post_tx_power_index=0xff
-ant3.ch9.ref_frame1.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame1.post_tx_power_index=0xff
-ant3.ch9.ref_frame2.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame2.post_tx_power_index=0xff
-ant3.ch9.ref_frame3.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame3.post_tx_power_index=0xff
-ant3.ch9.ref_frame4.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame4.post_tx_power_index=0xff
-ant3.ch9.ref_frame5.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame5.post_tx_power_index=0xff
-ant3.ch9.ref_frame6.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame6.post_tx_power_index=0xff
-ant3.ch9.ref_frame7.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame7.post_tx_power_index=0xff
-
-
-restricted_channels=0x0020
-alternate_pulse_shape=0x00
diff --git a/uwb/calibration-default.conf b/uwb/calibration-default.conf
deleted file mode 100644
index eb9d1af..0000000
--- a/uwb/calibration-default.conf
+++ /dev/null
@@ -1,72 +0,0 @@
-# ROW (Rest Of World) calibration file
-
-ant2.ch5.ref_frame0.tx_power_index=08:08:08:08
-ant2.ch5.ref_frame0.post_tx_power_index=0xff
-ant2.ch5.ref_frame1.tx_power_index=08:08:08:08
-ant2.ch5.ref_frame1.post_tx_power_index=0xff
-ant2.ch5.ref_frame2.tx_power_index=08:08:08:08
-ant2.ch5.ref_frame2.post_tx_power_index=0xff
-ant2.ch5.ref_frame3.tx_power_index=08:08:08:08
-ant2.ch5.ref_frame3.post_tx_power_index=0xff
-ant2.ch5.ref_frame4.tx_power_index=08:08:08:08
-ant2.ch5.ref_frame4.post_tx_power_index=0xff
-ant2.ch5.ref_frame5.tx_power_index=08:08:08:08
-ant2.ch5.ref_frame5.post_tx_power_index=0xff
-ant2.ch5.ref_frame6.tx_power_index=08:08:08:08
-ant2.ch5.ref_frame6.post_tx_power_index=0xff
-ant2.ch5.ref_frame7.tx_power_index=08:08:08:08
-ant2.ch5.ref_frame7.post_tx_power_index=0xff
-
-ant2.ch9.ref_frame0.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame0.post_tx_power_index=0xff
-ant2.ch9.ref_frame1.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame1.post_tx_power_index=0xff
-ant2.ch9.ref_frame2.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame2.post_tx_power_index=0xff
-ant2.ch9.ref_frame3.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame3.post_tx_power_index=0xff
-ant2.ch9.ref_frame4.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame4.post_tx_power_index=0xff
-ant2.ch9.ref_frame5.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame5.post_tx_power_index=0xff
-ant2.ch9.ref_frame6.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame6.post_tx_power_index=0xff
-ant2.ch9.ref_frame7.tx_power_index=08:08:08:08
-ant2.ch9.ref_frame7.post_tx_power_index=0xff
-
-ant3.ch5.ref_frame0.tx_power_index=08:08:08:08
-ant3.ch5.ref_frame0.post_tx_power_index=0xff
-ant3.ch5.ref_frame1.tx_power_index=08:08:08:08
-ant3.ch5.ref_frame1.post_tx_power_index=0xff
-ant3.ch5.ref_frame2.tx_power_index=08:08:08:08
-ant3.ch5.ref_frame2.post_tx_power_index=0xff
-ant3.ch5.ref_frame3.tx_power_index=08:08:08:08
-ant3.ch5.ref_frame3.post_tx_power_index=0xff
-ant3.ch5.ref_frame4.tx_power_index=08:08:08:08
-ant3.ch5.ref_frame4.post_tx_power_index=0xff
-ant3.ch5.ref_frame5.tx_power_index=08:08:08:08
-ant3.ch5.ref_frame5.post_tx_power_index=0xff
-ant3.ch5.ref_frame6.tx_power_index=08:08:08:08
-ant3.ch5.ref_frame6.post_tx_power_index=0xff
-ant3.ch5.ref_frame7.tx_power_index=08:08:08:08
-ant3.ch5.ref_frame7.post_tx_power_index=0xff
-
-ant3.ch9.ref_frame0.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame0.post_tx_power_index=0xff
-ant3.ch9.ref_frame1.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame1.post_tx_power_index=0xff
-ant3.ch9.ref_frame2.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame2.post_tx_power_index=0xff
-ant3.ch9.ref_frame3.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame3.post_tx_power_index=0xff
-ant3.ch9.ref_frame4.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame4.post_tx_power_index=0xff
-ant3.ch9.ref_frame5.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame5.post_tx_power_index=0xff
-ant3.ch9.ref_frame6.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame6.post_tx_power_index=0xff
-ant3.ch9.ref_frame7.tx_power_index=08:08:08:08
-ant3.ch9.ref_frame7.post_tx_power_index=0xff
-
-restricted_channels=0x0000
-alternate_pulse_shape=0x00
diff --git a/uwb/calibration.conf b/uwb/calibration.conf
deleted file mode 100644
index df67d0c..0000000
--- a/uwb/calibration.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-# common calibration file
-ant0.ch5.ant_delay=10:40:00:00
-ant0.ch9.ant_delay=10:40:00:00
-
-ant1.ch5.ant_delay=10:40:00:00
-ant1.ch9.ant_delay=10:40:00:00
-
-ant2.ch5.ant_delay=10:40:00:00
-ant2.ch9.ant_delay=10:40:00:00
-
-ant3.ch5.ant_delay=10:40:00:00
-ant3.ch9.ant_delay=10:40:00:00
-
-ant_grp1.ch5.pdoa.axisx.offset=00:00
-ant_grp1.ch9.pdoa.axisx.offset=00:00
-
-xtal_trim=0x30
-
-# Increase TX power of 0.25 dB
-# ant0.ch5.pa_gain_offset=0x01
-# ant0.ch9.pa_gain_offset=0x01
-
-# Decrease TX power of -0.25 dB
-# ant1.ch5.pa_gain_offset=0xFF
-# ant1.ch9.pa_gain_offset=0xFF
-
-# Increase TX power of 0.25 dB
-# ant2.ch5.pa_gain_offset=0x01
-# ant2.ch9.pa_gain_offset=0x01
-
-# Decrease TX power of -0.25 dB
-# ant3.ch5.pa_gain_offset=0xFF
-# ant3.ch9.pa_gain_offset=0xFF
diff --git a/uwb/configuration.conf b/uwb/configuration.conf
deleted file mode 100644
index aabf5f0..0000000
--- a/uwb/configuration.conf
+++ /dev/null
@@ -1,146 +0,0 @@
-[FIRA]ant_sets.ch5.range.rx_ant_set_nonranging = 2
-[FIRA]ant_sets.ch5.range.rx_ant_set_ranging = 2
-[FIRA]ant_sets.ch5.range.tx_ant_set_nonranging = 2
-[FIRA]ant_sets.ch5.range.tx_ant_set_ranging = 2
-[FIRA]ant_sets.ch9.range.rx_ant_set_nonranging = 2
-[FIRA]ant_sets.ch9.range.rx_ant_set_ranging = 2
-[FIRA]ant_sets.ch9.range.tx_ant_set_nonranging = 2
-[FIRA]ant_sets.ch9.range.tx_ant_set_ranging = 2
-[FIRA]ant_sets.ch5.azimuth.rx_ant_set_nonranging = 1
-[FIRA]ant_sets.ch5.azimuth.rx_ant_set_ranging = 1
-[FIRA]ant_sets.ch5.azimuth.tx_ant_set_nonranging = 3
-[FIRA]ant_sets.ch5.azimuth.tx_ant_set_ranging = 3
-[FIRA]ant_sets.ch9.azimuth.rx_ant_set_nonranging = 1
-[FIRA]ant_sets.ch9.azimuth.rx_ant_set_ranging = 1
-[FIRA]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 3
-[FIRA]ant_sets.ch9.azimuth.tx_ant_set_ranging = 3
-[FIRA]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging = 1
-[FIRA]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_azimuth = 1
-[FIRA]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_elevation = 0
-[FIRA]ant_sets.ch5.azimuth_elevation.tx_ant_set_nonranging = 3
-[FIRA]ant_sets.ch5.azimuth_elevation.tx_ant_set_ranging = 3
-[FIRA]ant_sets.ch9.azimuth_elevation.rx_ant_set_nonranging = 1
-[FIRA]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_azimuth = 1
-[FIRA]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_elevation = 0
-[FIRA]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging = 3
-[FIRA]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging = 3
-
-[CCC]ant_sets.ch5.range.rx_ant_set_nonranging = 2
-[CCC]ant_sets.ch5.range.rx_ant_set_ranging = 2
-[CCC]ant_sets.ch5.range.tx_ant_set_nonranging = 2
-[CCC]ant_sets.ch5.range.tx_ant_set_ranging = 2
-[CCC]ant_sets.ch9.range.rx_ant_set_nonranging = 2
-[CCC]ant_sets.ch9.range.rx_ant_set_ranging = 2
-[CCC]ant_sets.ch9.range.tx_ant_set_nonranging = 2
-[CCC]ant_sets.ch9.range.tx_ant_set_ranging = 2
-
-# Antenna Configuration
-wifi_spdt=01
-ant0.config=03
-ant1.config=13
-ant2.config=02
-ant3.config=12
-
-# Dual Rx (for Tx ANT3)
-ant_grp0.rf_config.rfoff=00
-ant_grp0.rf_config.tx=03
-ant_grp0.rf_config.tx_aoa=03
-ant_grp0.rf_config.rx_ip=0e
-ant_grp0.rf_config.rx_sts0=0e
-ant_grp0.rf_config.rx_sts1=0e
-ant_grp0.rf_config.rx_sts2=0e
-ant_grp0.rf_config.rx_sts3=0e
-ant_grp0.ext_sw_config=00
-ant_grp0.lna_rxa=01
-ant_grp0.lna_rxb=01
-ant_grp0.rx_config=04
-ant_grp0.pdoa_segments=02:07:00:00:00:00
-ant_grp0.pdoa_type=01:00:00
-ant_grp0.tx_power_control=00
-ant_grp0.ch5.pdoa.axisx.lut_id=00
-ant_grp0.ch9.pdoa.axisy.lut_id=01
-
-# Dual Rx (for Tx ANT3)
-ant_grp1.rf_config.rfoff=00
-ant_grp1.rf_config.tx=03
-ant_grp1.rf_config.tx_aoa=03
-ant_grp1.rf_config.rx_ip=0e
-ant_grp1.rf_config.rx_sts0=0e
-ant_grp1.rf_config.rx_sts1=0e
-ant_grp1.rf_config.rx_sts2=0e
-ant_grp1.rf_config.rx_sts3=0e
-ant_grp1.ext_sw_config=00
-ant_grp1.lna_rxa=01
-ant_grp1.lna_rxb=01
-ant_grp1.rx_config=04
-ant_grp1.pdoa_segments=02:07:00:00:00:00
-ant_grp1.pdoa_type=00:00:00
-ant_grp1.tx_power_control=00
-ant_grp1.ch5.pdoa.axisx.lut_id=00
-ant_grp1.ch9.pdoa.axisy.lut_id=01
-
-# Tx ANT2, Dual Rx (for Tx ANT2)
-ant_grp2.rf_config.rfoff=00
-ant_grp2.rf_config.tx=03
-ant_grp2.rf_config.tx_aoa=03
-ant_grp2.rf_config.rx_ip=0e
-ant_grp2.rf_config.rx_sts0=0e
-ant_grp2.rf_config.rx_sts1=0e
-ant_grp2.rf_config.rx_sts2=0e
-ant_grp2.rf_config.rx_sts3=0e
-ant_grp2.ext_sw_config=00
-ant_grp2.lna_rxa=01
-ant_grp2.lna_rxb=01
-ant_grp2.rx_config=05
-ant_grp2.pdoa_segments=02:07:00:00:00:00
-ant_grp2.pdoa_type=00:00:00
-ant_grp2.tx_power_control=00
-
-# Tx ANT3, Dual Rx (for Tx ANT3)
-ant_grp3.rf_config.rfoff=00
-ant_grp3.rf_config.tx=03
-ant_grp3.rf_config.tx_aoa=03
-ant_grp3.rf_config.rx_ip=0e
-ant_grp3.rf_config.rx_sts0=0e
-ant_grp3.rf_config.rx_sts1=0e
-ant_grp3.rf_config.rx_sts2=0e
-ant_grp3.rf_config.rx_sts3=0e
-ant_grp3.ext_sw_config=01
-ant_grp3.lna_rxa=01
-ant_grp3.lna_rxb=01
-ant_grp3.rx_config=05
-ant_grp3.pdoa_segments=02:07:00:00:00:00
-ant_grp3.pdoa_type=00:00:00
-ant_grp3.tx_power_control=00
-
-pdoa_lut0.data=de:e6:6f:f3:8b:e8:6f:f3:38:ea:6f:f3:e5:eb:6f:f3:92:ed:6f:f3:3f:ef:72:f6:ec:f0:11:f8:99:f2:4a:f9:45:f4:54:fa:f2:f5:44:fb:9f:f7:22:fc:4c:f9:f3:fc:f9:fa:bd:fd:a6:fc:81:fe:53:fe:41:ff:00:00:00:00:ad:01:bf:00:5a:03:7f:01:07:05:43:02:b4:06:0d:03:61:08:de:03:0e:0a:bc:04:bb:0b:ac:05:67:0d:b6:06:14:0f:ef:07:c1:10:8e:09:6e:12:91:0c:1b:14:91:0c:c8:15:91:0c:75:17:91:0c:22:19:91:0c
-pdoa_lut1.data=de:e6:6f:f3:8b:e8:6f:f3:38:ea:6f:f3:e5:eb:6f:f3:92:ed:6f:f3:3f:ef:6f:f3:ec:f0:6f:f3:99:f2:6d:f6:45:f4:63:f8:f2:f5:d1:f9:9f:f7:08:fb:4c:f9:21:fc:f9:fa:26:fd:a6:fc:1f:fe:53:fe:11:ff:00:00:00:00:ad:01:ef:00:5a:03:e1:01:07:05:da:02:b4:06:df:03:61:08:f8:04:0e:0a:2f:06:bb:0b:9d:07:67:0d:93:09:14:0f:91:0c:c1:10:91:0c:6e:12:91:0c:1b:14:91:0c:c8:15:91:0c:75:17:91:0c:22:19:91:0c
-
-# Reference frames definition
-ref_frame0.phy_cfg=44:21:07 # BPRF SET 3
-ref_frame0.payload_size=0x007f
-
-ref_frame1.phy_cfg=25:25:03 # HPRF SET 16
-ref_frame1.payload_size=0x0C68
-
-ref_frame2.phy_cfg=44:31:07 # BPRF DRBM_HP SP1
-ref_frame2.payload_size=0x007f
-
-ref_frame3.phy_cfg=44:22:07 # BPRF SET 4
-ref_frame3.payload_size=0x0000
-
-ref_frame4.phy_cfg=25:24:03 # HPRF DRHM_LR CL3 SP1
-ref_frame4.payload_size=0x0C68
-
-ref_frame5.phy_cfg=25:2c:03 # HPRF DRHM_LR CL7 SP1
-ref_frame5.payload_size=0x0C68
-
-ref_frame6.phy_cfg=25:2d:03 # HPRF DRHM_HR CL7
-ref_frame6.payload_size=0x0C68
-
-ref_frame7.phy_cfg=45:22:07 # HPRF SET 24
-ref_frame7.payload_size=0x0000
-
-# Post tones
-post_tx.pattern_data=DD:DD:DD:DD:77:77:77:77
-post_tx.pattern_repetitions=0x0000
diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk
deleted file mode 100644
index 09c4f13..0000000
--- a/uwb/uwb_calibration.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (C) 2021 The Android Open-Source Project
-#
-# 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.
-
-PRODUCT_PACKAGES += \
-    configuration.conf \
-    calibration.conf \
-    calibration-default.conf \
-    calibration-CE.conf \
-    calibration-FCC.conf \
-    calibration-JP.conf \
-    calibration-TW.conf \
-    calibration-RESTRICTED.conf