diff --git a/payments/db/payment_test.go b/payments/db/payment_test.go
index 2c2d668aa..df922a455 100644
--- a/payments/db/payment_test.go
+++ b/payments/db/payment_test.go
@@ -59,7 +59,10 @@ var (
 		ChannelID:        12345,
 		OutgoingTimeLock: 111,
 		AmtToForward:     555,
-		LegacyPayload:    true,
+
+		// Only tlv payloads are now supported in LND therefore we set
+		// LegacyPayload to false.
+		LegacyPayload: false,
 	}
 
 	testRoute = route.Route{
@@ -2203,7 +2206,7 @@ func TestMultiShard(t *testing.T) {
 
 		// Finally assert we cannot register more attempts.
 		_, err = paymentDB.RegisterAttempt(info.PaymentIdentifier, b)
-		require.Equal(t, registerErr, err)
+		require.ErrorIs(t, err, registerErr)
 	}
 
 	for _, test := range tests {
diff --git a/routing/route/route.go b/routing/route/route.go
index 1bb52badb..a575c415b 100644
--- a/routing/route/route.go
+++ b/routing/route/route.go
@@ -164,6 +164,9 @@ type Hop struct {
 	// The only reason we are keeping this member is that it could be the
 	// case that we have serialised hops persisted to disk where
 	// LegacyPayload is true.
+	//
+	// TODO(ziggie): Remove this field once we phase out the kv backend
+	// for payments.
 	LegacyPayload bool
 
 	// Metadata is additional data that is sent along with the payment to