@@ -75,8 +75,6 @@ func NewSnapshotter(opt Opt, prevLM leases.Manager) (snapshot.Snapshotter, lease

 	lm := newLeaseManager(s, prevLM)

-	// TODO: temp-leases

-

 	ll, err := lm.List(context.TODO())

 	if err != nil {

 		return nil, nil, err

@@ -1,6 +1,7 @@

 package buildkit

 import (

+	"context"

 	"net/http"

 	"os"

 	"path/filepath"

@@ -166,6 +167,14 @@ func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {

 		return nil, err

 	}

+	leases, err := lm.List(context.TODO(), "labels.\"buildkit/lease.temporary\"")

+	if err != nil {

+		return nil, err

+	}

+	for _, l := range leases {

+		lm.Delete(context.TODO(), l)

+	}

+

 	wopt := mobyworker.Opt{

 		ID:                "moby",

 		MetadataStore:     md,

@@ -59,7 +59,6 @@ type checker struct {

 }

 func (c *checker) Exists(key string, chain []digest.Digest) bool {

-	// TODO: neeeds update

 	if c.opt.ImageStore == nil {

 		return false

 	}