diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js
index ab233f1..a0efdb4 100644
--- a/package.nw/lib/gt.js
+++ b/package.nw/lib/gt.js
@@ -3703,9 +3703,7 @@ function qthToBox(iQTH, iDEcallsign, iCQ, locked, DE, band, wspr, hash)
 
       newRect.rectangle.pin.qso = false;
       GT.liveGrids[iQTH] = newRect;
-      return newRect;
     }
-    return null;
   }
   else
   {
@@ -3741,8 +3739,6 @@ function qthToBox(iQTH, iDEcallsign, iCQ, locked, DE, band, wspr, hash)
       zIndex: zIndex
     });
     rect.rectangle.setStyle(featureHoverStyle);
-
-    return rect;
   }
 }
 
@@ -5848,7 +5844,6 @@ function finalWsjtxDecode(newMessage, isFox = false, foxMessage)
       }
     }
 
-    var rect = null;
     // Grab the last word in the decoded message
     var qth = decodeWords[decodeWords.length - 1].trim();
     if (qth.length == 4)
@@ -5924,16 +5919,11 @@ function finalWsjtxDecode(newMessage, isFox = false, foxMessage)
         GT.appSettings.gtModeFilter == "Digital")
     )
     {
-      rect = qthToBox(theirQTH, msgDEcallsign, CQ, false, msgDXcallsign, newMessage.OB, null, hash);
+      qthToBox(theirQTH, msgDEcallsign, CQ, false, msgDXcallsign, newMessage.OB, null, hash);
       canPath = true;
     }
 
-    if (rect != null && theirQTH == "")
-    {
-      theirQTH = rect.qth;
-    }
-
-    if (rect)
+     if (theirQTH in GT.liveGrids)
     {
       GT.liveGrids[theirQTH].age = GT.timeNow;
     }
@@ -6006,34 +5996,6 @@ function finalWsjtxDecode(newMessage, isFox = false, foxMessage)
       if (validQTH)
       {
         callsign.grid = theirQTH;
-
-        if (rect != null && callsign.grid != rect.qth)
-        {
-          if (
-            (GT.appSettings.gtBandFilter.length == 0 ||
-              (GT.appSettings.gtBandFilter == "auto" &&
-                newMessage.OB == GT.appSettings.myBand) ||
-              newMessage.OB == GT.appSettings.gtBandFilter) &&
-            (GT.appSettings.gtModeFilter.length == 0 ||
-              (GT.appSettings.gtModeFilter == "auto" &&
-                newMessage.OM == GT.appSettings.myMode) ||
-              newMessage.OM == GT.appSettings.gtModeFilter ||
-              GT.appSettings.gtModeFilter == "Digital")
-          )
-          {
-            rect = qthToBox(
-              theirQTH,
-              msgDEcallsign,
-              CQ,
-              false,
-              msgDXcallsign,
-              newMessage.OB,
-              null,
-              hash
-            );
-            canPath = true;
-          }
-        }
       }
 
       callsign.time = theTimeStamp;