diff --git a/internal/codespaces/ssh.go b/internal/codespaces/ssh.go
index 50dabd620..0c81c4f32 100644
--- a/internal/codespaces/ssh.go
+++ b/internal/codespaces/ssh.go
@@ -56,7 +56,6 @@ func NewRemoteCommand(ctx context.Context, tunnelPort int, destination string, s
 // newSSHCommand populates an exec.Cmd to run a command (or if blank,
 // an interactive shell) over ssh.
 func newSSHCommand(ctx context.Context, port int, dst string, cmdArgs []string) (*exec.Cmd, []string, error) {
-	// TODO: Read SSH key from ~/.ssh/codespace and pass as argument with -i
 	connArgs := []string{"-p", strconv.Itoa(port), "-o", "NoHostAuthenticationForLocalhost=yes"}
 
 	// The ssh command syntax is: ssh [flags] user@host command [args...]
diff --git a/internal/codespaces/states.go b/internal/codespaces/states.go
index f2ec0dcd9..887735caf 100644
--- a/internal/codespaces/states.go
+++ b/internal/codespaces/states.go
@@ -60,7 +60,6 @@ func PollPostCreateStates(ctx context.Context, progress progressIndicator, apiCl
 
 	progress.StartProgressIndicatorWithLabel("Fetching SSH Details")
 	defer progress.StopProgressIndicator()
-	// TODO: This shouldn't care about the key
 	remoteSSHServerPort, sshUser, err := session.StartSSHServer(ctx)
 	if err != nil {
 		return fmt.Errorf("error getting ssh server details: %w", err)