diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/WaypointBuilder.java b/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/WaypointBuilder.java
index 39bf0f8b2f..11ff0107dd 100755
--- a/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/WaypointBuilder.java
+++ b/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/WaypointBuilder.java
@@ -479,7 +479,6 @@ public final class WaypointBuilder {
                 @Override
                 public void process(ResultSet rs) {
                     List<Waypoint> waypoints = new ArrayList<>();
-                    //List<List<Waypoint>> tracks = new ArrayList<>();
                     try {
                         while (rs.next()) {
                             int artifact_type_id = rs.getInt("artifact_type_id"); //NON-NLS
@@ -487,12 +486,7 @@ public final class WaypointBuilder {
 
                             ARTIFACT_TYPE type = ARTIFACT_TYPE.fromID(artifact_type_id);
                             if (artifactTypes.contains(type)) {
-                                List<Waypoint> curWaypoints = getWaypointForArtifact(skCase.getBlackboardArtifact(artifact_id), type);
-                                /*if (type == ARTIFACT_TYPE.TSK_GPS_TRACKPOINT || 
-                                    type == ARTIFACT_TYPE.TSK_GPS_TRACK) {
-                                    //tracks.add(curWaypoints);
-                                }*/
-                                waypoints.addAll(curWaypoints);
+                                waypoints.addAll(getWaypointForArtifact(skCase.getBlackboardArtifact(artifact_id), type));
                             }
 
                         }