diff --git a/cli/container.go b/cli/container.go
index bf48d797..0541822f 100644
--- a/cli/container.go
+++ b/cli/container.go
@@ -167,8 +167,6 @@ func createWorker(verbose bool, image string, args []string, env []string, name
 
 // removeContainer tries to rm a container, selected by Docker ID, and does a rm -f if it fails (e.g. if container is still running)
 func removeContainer(ID string) error {
-	// TODO: first check if container is running, then try to stop it with a timeout before trying to remove it
-	// if it does not terminate gracefully, try a force remove
 	ctx := context.Background()
 	docker, err := client.NewEnvClient()
 	if err != nil {