diff --git a/src/drivers/rc/crsf_rc/CrsfRc.cpp b/src/drivers/rc/crsf_rc/CrsfRc.cpp
index 8d805e5a71..39c79b797c 100644
--- a/src/drivers/rc/crsf_rc/CrsfRc.cpp
+++ b/src/drivers/rc/crsf_rc/CrsfRc.cpp
@@ -195,18 +195,14 @@ void CrsfRc::Run()
 		}
 	}
 
-	// vehicle command
-	vehicle_command_s vcmd;
+	vehicle_command_s vcmd{};
 
 	if (_vehicle_cmd_sub.update(&vcmd)) {
-		// Check for a pairing command
 		if (vcmd.command == vehicle_command_s::VEHICLE_CMD_START_RX_PAIR) {
-
 			uint8_t cmd_ret = vehicle_command_ack_s::VEHICLE_CMD_RESULT_UNSUPPORTED;
 
 			if (!_is_singlewire && !_armed) {
 				if ((int)vcmd.param1 == vehicle_command_s::RC_TYPE_CRSF) {
-					// CRSF binding command
 					if (BindCRSF()) {
 						cmd_ret = vehicle_command_ack_s::VEHICLE_CMD_RESULT_ACCEPTED;
 					}
diff --git a/src/drivers/rc/crsf_rc/CrsfRc.hpp b/src/drivers/rc/crsf_rc/CrsfRc.hpp
index c29a2e8768..a648048bd0 100644
--- a/src/drivers/rc/crsf_rc/CrsfRc.hpp
+++ b/src/drivers/rc/crsf_rc/CrsfRc.hpp
@@ -147,7 +147,6 @@ private:
 	};
 
 	enum class crsf_address_t : uint8_t {
-		broadcast = 0x00,
 		flight_controller = 0xC8,
 		crsf_receiver = 0xEC,
 		crsf_transmitter = 0xEE