Merge "Remove unnecessary UWB functions"