diff --git a/pkg/ssh/ssh.go b/pkg/ssh/ssh.go
index 5b6cb4e1509..a4abf260d14 100644
--- a/pkg/ssh/ssh.go
+++ b/pkg/ssh/ssh.go
@@ -383,7 +383,6 @@ func (l *SSHTunnelList) pickTunnel(addr string) (tunnel, error) {
 		return nil, fmt.Errorf("No SSH tunnels currently open. Were the targets able to accept an ssh-key for user %q?", l.user)
 	}
 	// Prefer same tunnel as kubelet
-	// TODO: Change l.entries to a map of address->tunnel
 	for _, entry := range l.entries {
 		if entry.Address == addr {
 			return entry.Tunnel, nil