diff --git a/pkg/server/container_create.go b/pkg/server/container_create.go
index 0d6d8f11b..9467311bb 100644
--- a/pkg/server/container_create.go
+++ b/pkg/server/container_create.go
@@ -173,7 +173,6 @@ func (c *criContainerdService) CreateContainer(ctx context.Context, r *runtime.C
 func (c *criContainerdService) generateContainerSpec(id string, sandboxPid uint32, config *runtime.ContainerConfig,
 	sandboxConfig *runtime.PodSandboxConfig, imageConfig *imagespec.ImageConfig, extraMounts []*runtime.Mount) (*runtimespec.Spec, error) {
 	// Creates a spec Generator with the default spec.
-	// TODO(random-liu): [P2] Move container runtime spec generation into a helper function.
 	g := generate.New()
 
 	// Set the relative path to the rootfs of the container from containerd's
@@ -211,8 +210,6 @@ func (c *criContainerdService) generateContainerSpec(id string, sandboxPid uint3
 		return nil, fmt.Errorf("failed to set devices mapping %+v: %v", config.GetDevices(), err)
 	}
 
-	// TODO(random-liu): [P1] Handle container logging, decorate and redirect to file.
-
 	setOCILinuxResource(&g, config.GetLinux().GetResources())
 
 	if sandboxConfig.GetLinux().GetCgroupParent() != "" {
diff --git a/pkg/server/image_remove.go b/pkg/server/image_remove.go
index 1c0506e36..39061377e 100644
--- a/pkg/server/image_remove.go
+++ b/pkg/server/image_remove.go
@@ -29,7 +29,6 @@ import (
 )
 
 // RemoveImage removes the image.
-// TODO(mikebrow): harden api
 // TODO(random-liu): Update CRI to pass image reference instead of ImageSpec. (See
 // kubernetes/kubernetes#46255)
 // TODO(random-liu): We should change CRI to distinguish image id and image spec.
diff --git a/pkg/server/sandbox_run.go b/pkg/server/sandbox_run.go
index 46b35b49e..fe91fdaaa 100644
--- a/pkg/server/sandbox_run.go
+++ b/pkg/server/sandbox_run.go
@@ -281,9 +281,6 @@ func (c *criContainerdService) generateSandboxContainerSpec(id string, config *r
 	// Set hostname.
 	g.SetHostname(config.GetHostname())
 
-	// TODO(random-liu): [P0] Add NamespaceGetter and PortMappingGetter to initialize network plugin.
-
-	// TODO(random-liu): [P0] Add annotation to identify the container is managed by cri-containerd.
 	// TODO(random-liu): [P2] Consider whether to add labels and annotations to the container.
 
 	// Set cgroups parent.