diff --git a/libimage/inspect.go b/libimage/inspect.go
index 05d60edfc..ae06acd2c 100644
--- a/libimage/inspect.go
+++ b/libimage/inspect.go
@@ -128,7 +128,7 @@ func (i *Image) Inspect(ctx context.Context, options *InspectOptions) (*ImageDat
 		Config:       &ociImage.Config,
 		Version:      info.DockerVersion,
 		Size:         size,
-		VirtualSize:  size, // TODO: they should be different (inherited from Podman)
+		VirtualSize:  size, // NOTE: same as size. Inherited from Docker where it's scheduled for deprecation.
 		Digest:       i.Digest(),
 		Labels:       info.Labels,
 		RootFS: &RootFS{
diff --git a/libimage/manifests/manifests_test.go b/libimage/manifests/manifests_test.go
index 38f71e4dd..eeb6fe0b1 100644
--- a/libimage/manifests/manifests_test.go
+++ b/libimage/manifests/manifests_test.go
@@ -94,7 +94,7 @@ func TestAddRemove(t *testing.T) {
 	if unshare.IsRootless() {
 		t.Skip("Test can only run as root")
 	}
-	ctx := context.TODO()
+	ctx := context.Background()
 
 	ref, err := alltransports.ParseImageName(otherListImage)
 	assert.Nilf(t, err, "ParseImageName(%q)", otherListImage)
@@ -163,7 +163,7 @@ func TestReference(t *testing.T) {
 	if unshare.IsRootless() {
 		t.Skip("Test can only run as root")
 	}
-	ctx := context.TODO()
+	ctx := context.Background()
 
 	dir, err := ioutil.TempDir("", "manifests")
 	assert.Nilf(t, err, "error creating temporary directory")
@@ -263,7 +263,7 @@ func TestPush(t *testing.T) {
 	if unshare.IsRootless() {
 		t.Skip("Test can only run as root")
 	}
-	ctx := context.TODO()
+	ctx := context.Background()
 
 	dir, err := ioutil.TempDir("", "manifests")
 	assert.Nilf(t, err, "error creating temporary directory")
diff --git a/libimage/pull.go b/libimage/pull.go
index 771756160..d204ef1c4 100644
--- a/libimage/pull.go
+++ b/libimage/pull.go
@@ -533,9 +533,6 @@ func (r *Runtime) copySingleImageFromRegistry(ctx context.Context, imageName str
 	sys := r.systemContextCopy()
 	resolved, err := shortnames.Resolve(sys, imageName)
 	if err != nil {
-		// TODO: that is a too big of a hammer since we should only
-		// ignore errors that indicate that there's no alias and no
-		// USRs.  Must be addressed in c/image first.
 		if localImage != nil && pullPolicy == config.PullPolicyNewer {
 			return []string{resolvedImageName}, nil
 		}