diff --git a/Wireless_Communication/UWB/app.h b/Wireless_Communication/UWB/app.h
index b64d1aae4af65481da72a0e7bf7bddd1ac1f88a8..7f3fab316fa124fc807a69ebaecbab37d1204823 100644
--- a/Wireless_Communication/UWB/app.h
+++ b/Wireless_Communication/UWB/app.h
@@ -10,7 +10,6 @@
 
 typedef enum {
     LIVE_CHECK = 1,     // no parameters
-    GIVE_TOKEN,         // no parameters
     BPM_COMMAND,        // no parameters
     POLL_REQUEST,       // no parameters
     SEND_DISTANCES,     // 1 byte number of beacons (n), n * 2 bytes beacon address, n * sizeof(double) bytes beacon distance
@@ -30,7 +29,6 @@ typedef enum {
     RANGING_INITIATOR = 1,
     RESPONDER,
     AWAITING_SERIAL,
-    TAG_WAITING_FOR_TOKEN,
     BEACON_POSITIONING_MODE
 } deviceState;
 
diff --git a/Wireless_Communication/UWB/mac.cpp b/Wireless_Communication/UWB/mac.cpp
index 333dcbf8abeae1ce515c7bacd3ebf50575a89aa4..6efc4f3d818dbc08c7ede70a370298a12272bb58 100644
--- a/Wireless_Communication/UWB/mac.cpp
+++ b/Wireless_Communication/UWB/mac.cpp
@@ -88,9 +88,9 @@ void setMacTxDataAndFCTRL(macHeader *mhr, size_t payloadLength, uint8_t *payload
 }
 
 // Copy receive buffer into mac header
-void rxBufferToMacHeader(macHeader *mhr, uint8_t *rxBuffer, size_t length) {
-    memcpy((uint8_t *)mhr, rxBuffer, length);
-}
+// void rxBufferToMacHeader(macHeader *mhr, uint8_t *rxBuffer, size_t length) {
+//     memcpy((uint8_t *)mhr, rxBuffer, length);
+// }
 
 // Construct the 16-bit source address from the MHR
 uint16_t getMacSrcAddr(macHeader *mhr) {
diff --git a/Wireless_Communication/UWB/mac.h b/Wireless_Communication/UWB/mac.h
index c87ca71f7e142b7f62748d58b086399a7a9fd97a..41d997b9de4f7876962e776b5e7f671c41d3bab3 100644
--- a/Wireless_Communication/UWB/mac.h
+++ b/Wireless_Communication/UWB/mac.h
@@ -5,7 +5,6 @@
 
 typedef struct {
     uint8_t               frame_ctrl[2];
-    // uint8_t               sequence_num;
     uint8_t               panID[2];
     uint8_t               destAddr[2];
     uint8_t               srcAddr[2];
@@ -23,7 +22,7 @@ void initializeDataMHR(macHeader *mhr, bool AR, uint16_t panID, uint16_t srcAddr
 void initializeEnhAckMHR(macHeader *mhr, uint16_t panID, uint16_t srcAddr, uint16_t destAddr = 0xFFFF);
 void setMacTxDataAndFCTRL(macHeader *mhr, size_t payloadLength, uint8_t *payload, uint8_t ranging);
 
-void rxBufferToMacHeader(macHeader *mhr, uint8_t *rxBuffer, size_t length);
+// void rxBufferToMacHeader(macHeader *mhr, uint8_t *rxBuffer, size_t length);
 uint16_t getMacSrcAddr(macHeader *mhr);
 uint16_t getMacDestAddr(macHeader *mhr);
 bool checkAckRequest(macHeader *mhr);