From 95e0fc694ffa998190a65fc09b9f076eb2651820 Mon Sep 17 00:00:00 2001
From: Lantao Liu <lantaol@google.com>
Date: Fri, 2 Jun 2017 02:15:44 +0000
Subject: [PATCH] Cleanup some code.

Signed-off-by: Lantao Liu <lantaol@google.com>
---
 pkg/server/image_pull.go  |  1 -
 pkg/server/sandbox_run.go |  1 -
 pkg/server/service.go     | 12 ------------
 3 files changed, 14 deletions(-)

diff --git a/pkg/server/image_pull.go b/pkg/server/image_pull.go
index 698ab8054..41c567721 100644
--- a/pkg/server/image_pull.go
+++ b/pkg/server/image_pull.go
@@ -186,7 +186,6 @@ func (r *resourceSet) all() map[string]struct{} {
 
 // pullImage pulls image and returns image id (config digest) and manifest digest.
 // The ref should be normalized image reference.
-// TODO(random-liu): [P0] Wait for all downloadings to be done before return.
 func (c *criContainerdService) pullImage(ctx context.Context, ref string) (
 	imagedigest.Digest, imagedigest.Digest, error) {
 	// Resolve the image reference to get descriptor and fetcher.
diff --git a/pkg/server/sandbox_run.go b/pkg/server/sandbox_run.go
index 9d329169f..74c7ae17b 100644
--- a/pkg/server/sandbox_run.go
+++ b/pkg/server/sandbox_run.go
@@ -152,7 +152,6 @@ func (c *criContainerdService) RunPodSandbox(ctx context.Context, r *runtime.Run
 			TypeUrl: runtimespec.Version,
 			Value:   rawSpec,
 		},
-		// TODO(random-liu): [P0] Get rootfs mount from containerd.
 		Rootfs:  rootfsMounts,
 		Runtime: defaultRuntime,
 		// No stdin for sandbox container.
diff --git a/pkg/server/service.go b/pkg/server/service.go
index c1e5d028a..6a9f92d2e 100644
--- a/pkg/server/service.go
+++ b/pkg/server/service.go
@@ -40,18 +40,6 @@ import (
 	"github.com/kubernetes-incubator/cri-containerd/pkg/registrar"
 )
 
-// TODO remove the underscores from the following imports as the services are
-// implemented. "_" is being used to hold the reference to keep autocomplete
-// from deleting them until referenced below.
-// nolint: golint
-import (
-	_ "github.com/containerd/containerd/api/types/container"
-	_ "github.com/containerd/containerd/api/types/descriptor"
-	_ "github.com/containerd/containerd/api/types/mount"
-	_ "github.com/opencontainers/image-spec/specs-go"
-	_ "github.com/opencontainers/runtime-spec/specs-go"
-)
-
 // CRIContainerdService is the interface implement CRI remote service server.
 type CRIContainerdService interface {
 	Start()