diff --git a/uwb/calibration/UWB-calibration-am.conf b/uwb/calibration/UWB-calibration-am.conf
deleted file mode 100644
index ef3e5904..00000000
--- a/uwb/calibration/UWB-calibration-am.conf
+++ /dev/null
@@ -1 +0,0 @@
-restricted_channels=0xffff
diff --git a/uwb/calibration/UWB-calibration-ar.conf b/uwb/calibration/UWB-calibration-ar.conf
deleted file mode 100644
index ef3e5904..00000000
--- a/uwb/calibration/UWB-calibration-ar.conf
+++ /dev/null
@@ -1 +0,0 @@
-restricted_channels=0xffff
diff --git a/uwb/calibration/UWB-calibration-az.conf b/uwb/calibration/UWB-calibration-az.conf
deleted file mode 100644
index ef3e5904..00000000
--- a/uwb/calibration/UWB-calibration-az.conf
+++ /dev/null
@@ -1 +0,0 @@
-restricted_channels=0xffff
diff --git a/uwb/calibration/UWB-calibration-by.conf b/uwb/calibration/UWB-calibration-by.conf
deleted file mode 100644
index ef3e5904..00000000
--- a/uwb/calibration/UWB-calibration-by.conf
+++ /dev/null
@@ -1 +0,0 @@
-restricted_channels=0xffff
diff --git a/uwb/calibration/UWB-calibration-id.conf b/uwb/calibration/UWB-calibration-id.conf
deleted file mode 100644
index ef3e5904..00000000
--- a/uwb/calibration/UWB-calibration-id.conf
+++ /dev/null
@@ -1 +0,0 @@
-restricted_channels=0xffff
diff --git a/uwb/calibration/UWB-calibration-jp.conf b/uwb/calibration/UWB-calibration-jp.conf
deleted file mode 100644
index ffdc4d69..00000000
--- a/uwb/calibration/UWB-calibration-jp.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-ant0.ch5.prf16.tx_power=0
-ant0.ch5.prf16.pg_delay=0
-ant0.ch5.prf64.tx_power=0
-ant0.ch5.prf64.pg_delay=0
-ant0.ch9.prf16.tx_power=0x2A2A2A2A
-ant0.ch9.prf16.pg_delay=0x20
-ant0.ch9.prf64.tx_power=0x2A2A2A2A
-ant0.ch9.prf64.pg_delay=0x20
-ant1.ch5.prf16.tx_power=0
-ant1.ch5.prf16.pg_delay=0
-ant1.ch5.prf64.tx_power=0
-ant1.ch5.prf64.pg_delay=0
-ant1.ch9.prf16.tx_power=0x2A2A2A2A
-ant1.ch9.prf16.pg_delay=0x20
-ant1.ch9.prf64.tx_power=0x2A2A2A2A
-ant1.ch9.prf64.pg_delay=0x20
-ant2.ch5.prf16.tx_power=0
-ant2.ch5.prf16.pg_delay=0
-ant2.ch5.prf64.tx_power=0
-ant2.ch5.prf64.pg_delay=0
-ant2.ch9.prf16.tx_power=0x2A2A2A2A
-ant2.ch9.prf16.pg_delay=0x20
-ant2.ch9.prf64.tx_power=0x2A2A2A2A
-ant2.ch9.prf64.pg_delay=0x20
-ant3.ch5.prf16.tx_power=0
-ant3.ch5.prf16.pg_delay=0
-ant3.ch5.prf64.tx_power=0
-ant3.ch5.prf64.pg_delay=0
-ant3.ch9.prf16.tx_power=0x2A2A2A2A
-ant3.ch9.prf16.pg_delay=0x20
-ant3.ch9.prf64.tx_power=0x2A2A2A2A
-ant3.ch9.prf64.pg_delay=0x20
-alternate_pulse_shape=0x01
-restricted_channels=0x20
diff --git a/uwb/calibration/UWB-calibration-kg.conf b/uwb/calibration/UWB-calibration-kg.conf
deleted file mode 100644
index ef3e5904..00000000
--- a/uwb/calibration/UWB-calibration-kg.conf
+++ /dev/null
@@ -1 +0,0 @@
-restricted_channels=0xffff
diff --git a/uwb/calibration/UWB-calibration-kz.conf b/uwb/calibration/UWB-calibration-kz.conf
deleted file mode 100644
index ef3e5904..00000000
--- a/uwb/calibration/UWB-calibration-kz.conf
+++ /dev/null
@@ -1 +0,0 @@
-restricted_channels=0xffff
diff --git a/uwb/calibration/UWB-calibration-np.conf b/uwb/calibration/UWB-calibration-np.conf
deleted file mode 100644
index ef3e5904..00000000
--- a/uwb/calibration/UWB-calibration-np.conf
+++ /dev/null
@@ -1 +0,0 @@
-restricted_channels=0xffff
diff --git a/uwb/calibration/UWB-calibration-pk.conf b/uwb/calibration/UWB-calibration-pk.conf
deleted file mode 100644
index ef3e5904..00000000
--- a/uwb/calibration/UWB-calibration-pk.conf
+++ /dev/null
@@ -1 +0,0 @@
-restricted_channels=0xffff
diff --git a/uwb/calibration/UWB-calibration-py.conf b/uwb/calibration/UWB-calibration-py.conf
deleted file mode 100644
index ef3e5904..00000000
--- a/uwb/calibration/UWB-calibration-py.conf
+++ /dev/null
@@ -1 +0,0 @@
-restricted_channels=0xffff
diff --git a/uwb/calibration/UWB-calibration-ru.conf b/uwb/calibration/UWB-calibration-ru.conf
deleted file mode 100644
index ef3e5904..00000000
--- a/uwb/calibration/UWB-calibration-ru.conf
+++ /dev/null
@@ -1 +0,0 @@
-restricted_channels=0xffff
diff --git a/uwb/calibration/UWB-calibration-sb.conf b/uwb/calibration/UWB-calibration-sb.conf
deleted file mode 100644
index ef3e5904..00000000
--- a/uwb/calibration/UWB-calibration-sb.conf
+++ /dev/null
@@ -1 +0,0 @@
-restricted_channels=0xffff
diff --git a/uwb/calibration/UWB-calibration-tj.conf b/uwb/calibration/UWB-calibration-tj.conf
deleted file mode 100644
index ef3e5904..00000000
--- a/uwb/calibration/UWB-calibration-tj.conf
+++ /dev/null
@@ -1 +0,0 @@
-restricted_channels=0xffff
diff --git a/uwb/calibration/UWB-calibration-tm.conf b/uwb/calibration/UWB-calibration-tm.conf
deleted file mode 100644
index ef3e5904..00000000
--- a/uwb/calibration/UWB-calibration-tm.conf
+++ /dev/null
@@ -1 +0,0 @@
-restricted_channels=0xffff
diff --git a/uwb/calibration/UWB-calibration-tw.conf b/uwb/calibration/UWB-calibration-tw.conf
deleted file mode 100644
index 68c32d6c..00000000
--- a/uwb/calibration/UWB-calibration-tw.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-alternate_pulse_shape=0x01
-restricted_channels=0x20
diff --git a/uwb/calibration/UWB-calibration-ua.conf b/uwb/calibration/UWB-calibration-ua.conf
deleted file mode 100644
index ef3e5904..00000000
--- a/uwb/calibration/UWB-calibration-ua.conf
+++ /dev/null
@@ -1 +0,0 @@
-restricted_channels=0xffff
diff --git a/uwb/calibration/UWB-calibration-uz.conf b/uwb/calibration/UWB-calibration-uz.conf
deleted file mode 100644
index ef3e5904..00000000
--- a/uwb/calibration/UWB-calibration-uz.conf
+++ /dev/null
@@ -1 +0,0 @@
-restricted_channels=0xffff
diff --git a/uwb/calibration/country_conf_gen.sh b/uwb/calibration/country_conf_gen.sh
deleted file mode 100755
index 777be2d7..00000000
--- a/uwb/calibration/country_conf_gen.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-# This script is used to generate uwb conuntry configuration file,
-# and the PRODUCT_COPY_FILES list in uwb.mk based on uwb_country.conf
-# Bug: 196073172
-
-project=("r4" "p7")
-count=1
-
-while read line ; do
-    if [[ "$line" =~ ^"*" ]]; then
-        header=${line:1}
-    elif [[ "$line" =~ ^"\"" ]]; then
-        line=$(echo ${line/,} | tr -d "\"")
-        country[count]=$(echo $line | cut -d ':' -f1)
-        code[count]=$(echo $line | cut -d ':' -f2 | tr -d " ")
-
-            if [ "$header" = "restricted_channels=0x20" ]; then
-                echo "alternate_pulse_shape=0x01" > UWB-calibration-${code[$count]}.conf
-                echo "$header" >> UWB-calibration-${code[$count]}.conf
-            else
-            echo "$header" > UWB-calibration-${code[$count]}.conf
-            fi
-    fi
-((count++))
-done < uwb_country.conf
-
-    echo "==============  $var  =============="
-    for var2 in ${code[@]}; do
-            echo "\$(LOCAL_UWB_CAL_DIR)/UWB-calibration-$var2.conf:\$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-$var2.conf \\"
-    done
diff --git a/uwb/calibration/init.uwb.calib.sh b/uwb/calibration/init.uwb.calib.sh
deleted file mode 100644
index a604885a..00000000
--- a/uwb/calibration/init.uwb.calib.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/vendor/bin/sh
-if [ -z "$2" ]
-then
-    echo "usage is $0 input-calibration output_calibration"
-    exit 0
-fi
-OUTPUT_CALIB="$2"
-if [ ! -f "$OUTPUT_CALIB" ]; then
-    touch $OUTPUT_CALIB
-    chmod 0600 $OUTPUT_CALIB
-    file="$1"
-    while IFS=, read -r f1 f2
-    do
-        case $f1 in
-            "UWB_cal_tx_xtal_reg_final_value")
-                if [ $((0x$f2)) -gt 63 ]; then
-                    f2=63
-                fi
-                echo 'xtal_trim=0x'$f2 >> $OUTPUT_CALIB
-                ;;
-            "UWB_TX1RX1_CH5_tx_ant_delay_cal_data")
-                echo 'ant0.ch5.prf64.ant_delay=0x'$f2 >> $OUTPUT_CALIB
-                ;;
-            "UWB_TX1RX1_CH5_rx_ant_delay_cal_data")
-                echo 'ant1.ch5.prf64.ant_delay=0x'$f2 >> $OUTPUT_CALIB
-                ;;
-            "UWB_TX1RX1_CH9_tx_ant_delay_cal_data")
-                echo 'ant0.ch9.prf64.ant_delay=0x'$f2 >> $OUTPUT_CALIB
-                ;;
-            "UWB_TX1RX1_CH9_rx_ant_delay_cal_data")
-                echo 'ant1.ch9.prf64.ant_delay=0x'$f2 >> $OUTPUT_CALIB
-                ;;
-            "UWB_RX2_CH5_cal_pdoa_data")
-                 # float value * 2048
-                 #/vendor/bin/sh does not support "bc"
-                 base=2048
-                 ones=${f2%%.*}
-                 dec=${f2#*.}
-                 ones="$(($ones*$base))"
-                 if [ ${#dec} -eq 2 ]; then
-                     dec="$(($dec*$base/100))"
-                     echo 'ant1.ant3.ch5.pdoa_offset='$(($ones+$dec)) >> $OUTPUT_CALIB
-                 fi
-                 ;;
-             "UWB_RX2_CH9_cal_pdoa_data")
-                 base=2048
-                 ones=${f2%%.*}
-                 dec=${f2#*.}
-                 ones="$(($ones*$base))"
-                 if [ ${#dec} -eq 2 ]; then
-                     dec="$(($dec*$base/100))"
-                     echo 'ant1.ant3.ch9.pdoa_offset='$(($ones+$dec)) >> $OUTPUT_CALIB
-                 fi
-        esac
-    done <"$file"
-    exit 0
-fi
diff --git a/uwb/calibration/init.uwb.calib.xtal.sh b/uwb/calibration/init.uwb.calib.xtal.sh
deleted file mode 100644
index efdfd6b0..00000000
--- a/uwb/calibration/init.uwb.calib.xtal.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/vendor/bin/sh
-# only use xtal_trim from factory calibration
-if [ -z "$2" ]
-then
-    echo "usage is $0 input-calibration output_calibration"
-    exit 0
-fi
-OUTPUT_CALIB="$2"
-if [ ! -f "$OUTPUT_CALIB" ]; then
-    touch $OUTPUT_CALIB
-    chmod 0644 $OUTPUT_CALIB
-    file="$1"
-    while IFS=, read -r f1 f2
-    do
-        case $f1 in
-            "UWB_cal_tx_xtal_reg_final_value")
-                if [ $((0x$f2)) -gt 63 ]; then
-                    f2=63
-                fi
-                echo 'xtal_trim=0x'$f2 >> $OUTPUT_CALIB
-                ;;
-        esac
-    done <"$file"
-    exit 0
-fi
diff --git a/uwb/calibration/uwb_country.conf b/uwb/calibration/uwb_country.conf
deleted file mode 100644
index 51dd4341..00000000
--- a/uwb/calibration/uwb_country.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-*restricted_channels=0xffff
-"Argentina": "ar",
-"Armenia": "am",
-"Azerbaijan": "az",
-"Belarus": "by",
-"Indonesia": "id",
-"Kazakhstan": "kz",
-"Kyrgyzstan": "kg",
-"Nepal": "np",
-"Pakistan": "pk",
-"Paraguay": "py",
-"Russia": "ru",
-"Solomon Islands": "sb",
-"Tajikistan": "tj",
-"Turkmenistanr": "tm",
-"Ukraine": "ua",
-"Uzbekistan": "uz"
-
-*restricted_channels=0x20
-"Japan": "jp",
-"Taiwan": "tw"
diff --git a/uwb/uwb.mk b/uwb/uwb.mk
deleted file mode 100644
index 7984a091..00000000
--- a/uwb/uwb.mk
+++ /dev/null
@@ -1,42 +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.
-
-# UWB - ultra wide band
-$(call inherit-product-if-exists, vendor/qorvo/uwb/uwb.mk)
-
-LOCAL_UWB_CAL_DIR=device/google/gs101/uwb/calibration
-
-PRODUCT_COPY_FILES += \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-jp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-jp.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-ar.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-ar.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-am.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-am.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-az.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-az.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-by.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-by.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-id.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-id.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-kz.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-kz.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-kg.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-kg.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-np.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-np.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-pk.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-pk.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-py.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-py.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-ru.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-ru.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-sb.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-sb.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-tj.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-tj.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-tm.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-tm.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-ua.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-ua.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-uz.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-uz.conf \
-    $(LOCAL_UWB_CAL_DIR)/init.uwb.calib.xtal.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.uwb.calib.sh \
-
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.uwb.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.uwb.xml