diff --git a/network/ephemeral/tracker.go b/network/ephemeral/tracker.go
index dc094afb20a7a0d8f4ac4b8331fd4301c00a456e..b3265afe1a14738d9abd1247dd7932024a0debc3 100644
--- a/network/ephemeral/tracker.go
+++ b/network/ephemeral/tracker.go
@@ -141,16 +141,13 @@ func generateIdentities(protoIds []ephemeral.ProtoIdentity, ourId *id.ID,
 	// Add identities for every ephemeral ID
 	for i, eid := range protoIds {
 		// Expand the grace period for both start and end
-		//  This does not actually modify anything....   time is not a pointer and even if it were this returns the new value???
-		// eid.End.Add(validityGracePeriod)
-		// eid.Start.Add(-validityGracePeriod)
 		identities[i] = reception.Identity{
 			EphId:       eid.Id,
 			Source:      ourId,
 			AddressSize: addressSize,
 			End:         eid.End,
 			StartValid:  eid.Start.Add(-validityGracePeriod),
-			EndValid:    eid.End.Add(validityGracePeriod), // What is this vs end?  should it be modified??
+			EndValid:    eid.End.Add(validityGracePeriod),
 			Ephemeral:   false,
 		}
 
diff --git a/network/ephemeral/tracker_test.go b/network/ephemeral/tracker_test.go
index 7e5cd8887eb719b4713363c6c19bbac64e545aea..47b8f034766c45c003f9f4997a599cf1ad22cfbd 100644
--- a/network/ephemeral/tracker_test.go
+++ b/network/ephemeral/tracker_test.go
@@ -131,7 +131,7 @@ func TestGenerateIdentities(t *testing.T) {
 	}
 	protoIds := []ephemeral.ProtoIdentity{{eid, s, e}}
 	generated := generateIdentities(protoIds, id.NewIdFromString("escaline", id.Node, t), 16)
-	if generated[0].End != protoIds[0].End.Add(5*time.Minute) {
+	if generated[0].EndValid != protoIds[0].End.Add(5*time.Minute) {
 		t.Errorf("End was not modified.  Orig %+v, Generated %+v", protoIds[0].End, generated[0].End)
 	}
 	if generated[0].StartValid != protoIds[0].Start.Add(-5*time.Minute) {