diff --git a/Meshtastic/Views/Messages/ChannelMessageList.swift b/Meshtastic/Views/Messages/ChannelMessageList.swift
index 57f2309b..1fc7f5a7 100644
--- a/Meshtastic/Views/Messages/ChannelMessageList.swift
+++ b/Meshtastic/Views/Messages/ChannelMessageList.swift
@@ -292,15 +292,7 @@ struct ChannelMessageList: View {
 				Button {
 					let userLongName = bleManager.connectedPeripheral != nil ? bleManager.connectedPeripheral.longName : "Unknown"
 					sendPositionWithMessage = true
-					if UserDefaults.meshtasticUsername.count > 0 {
-
-						typingMessage +=  "📍 " + UserDefaults.meshtasticUsername + " has shared their position with you from node " + userLongName
-
-					} else {
-
-						typingMessage +=  "📍 " + userLongName + " has shared their position with you."
-					}
-
+					typingMessage +=  "📍 " + userLongName + " has shared their position with you."
 				} label: {
 					Text("share.position")
 					Image(systemName: "mappin.and.ellipse")
diff --git a/Meshtastic/Views/Messages/UserMessageList.swift b/Meshtastic/Views/Messages/UserMessageList.swift
index a9dc229e..77afb05e 100644
--- a/Meshtastic/Views/Messages/UserMessageList.swift
+++ b/Meshtastic/Views/Messages/UserMessageList.swift
@@ -258,13 +258,7 @@ struct UserMessageList: View {
 				Button {
 					let userLongName = bleManager.connectedPeripheral != nil ? bleManager.connectedPeripheral.longName : "Unknown"
 					sendPositionWithMessage = true
-
-					if UserDefaults.meshtasticUsername.count > 0 {
-						typingMessage =  "📍 " + UserDefaults.meshtasticUsername + " has shared their position with you from node " + userLongName + " and requested a response with your position."
-					} else {
-						typingMessage =  "📍 " + userLongName + " has shared their position and requested a response with your position."
-					}
-
+					typingMessage =  "📍 " + userLongName + " has shared their position and requested a response with your position."
 				} label: {
 					Text("share.position")
 					Image(systemName: "mappin.and.ellipse")
diff --git a/Meshtastic/Views/Settings/Config/DeviceConfig.swift b/Meshtastic/Views/Settings/Config/DeviceConfig.swift
index 6153be66..17623ad2 100644
--- a/Meshtastic/Views/Settings/Config/DeviceConfig.swift
+++ b/Meshtastic/Views/Settings/Config/DeviceConfig.swift
@@ -219,7 +219,6 @@ struct DeviceConfig: View {
 							dc.debugLogEnabled = debugLogEnabled
 							dc.buttonGpio = UInt32(buttonGPIO)
 							dc.buzzerGpio = UInt32(buzzerGPIO)
-						
 							//dc.gpsEnGpio = UInt32(gpsEnGPIO)
 							dc.rebroadcastMode = RebroadcastModes(rawValue: rebroadcastMode)?.protoEnumValue() ?? RebroadcastModes.all.protoEnumValue()
 							dc.doubleTapAsButtonPress = doubleTapAsButtonPress