diff --git a/cmd/ghcs/ssh.go b/cmd/ghcs/ssh.go
index e5289e205..08c3bd7ca 100644
--- a/cmd/ghcs/ssh.go
+++ b/cmd/ghcs/ssh.go
@@ -59,7 +59,8 @@ func ssh(ctx context.Context, sshProfile, codespaceName string, localSSHServerPo
 		return fmt.Errorf("error connecting to Live Share: %v", err)
 	}
 
-	remoteSSHServerPort, sshUser, err := codespaces.StartSSHServer(ctx, session, log)
+	log.Println("Fetching SSH Details...")
+	remoteSSHServerPort, sshUser, err := session.StartSSHServer(ctx)
 	if err != nil {
 		return fmt.Errorf("error getting ssh server details: %v", err)
 	}
diff --git a/internal/codespaces/ssh.go b/internal/codespaces/ssh.go
index 14dbfbb88..28c2761b1 100644
--- a/internal/codespaces/ssh.go
+++ b/internal/codespaces/ssh.go
@@ -2,53 +2,11 @@ package codespaces
 
 import (
 	"context"
-	"errors"
-	"fmt"
 	"os"
 	"os/exec"
 	"strconv"
-	"strings"
-
-	"github.com/github/go-liveshare"
 )
 
-// StartSSHServer installs (if necessary) and starts the SSH in the codespace.
-// It returns the remote port where it is running, the user to log in with, or an error if something failed.
-func StartSSHServer(ctx context.Context, session *liveshare.Session, log logger) (serverPort int, user string, err error) {
-	log.Println("Fetching SSH details...")
-
-	sshServer := session.SSHServer()
-
-	sshServerStartResult, err := sshServer.StartRemoteServer(ctx)
-	if err != nil {
-		return 0, "", fmt.Errorf("error starting live share: %v", err)
-	}
-
-	if !sshServerStartResult.Result {
-		return 0, "", errors.New(sshServerStartResult.Message)
-	}
-
-	portInt, err := strconv.Atoi(sshServerStartResult.ServerPort)
-	if err != nil {
-		return 0, "", fmt.Errorf("error parsing port: %v", err)
-	}
-
-	return portInt, sshServerStartResult.User, nil
-}
-
-// Shell runs an interactive secure shell over an existing
-// port-forwarding session. It runs until the shell is terminated
-// (including by cancellation of the context).
-func Shell(ctx context.Context, log logger, port int, destination string, usingCustomPort bool) error {
-	cmd, connArgs := newSSHCommand(ctx, port, destination, "")
-
-	if usingCustomPort {
-		log.Println("Connection Details: ssh " + destination + " " + strings.Join(connArgs, " "))
-	}
-
-	return cmd.Run()
-}
-
 // NewRemoteCommand returns an exec.Cmd that will securely run a shell
 // command on the remote machine.
 func NewRemoteCommand(ctx context.Context, tunnelPort int, destination, command string) *exec.Cmd {
diff --git a/internal/codespaces/states.go b/internal/codespaces/states.go
index 492ce3964..f4375fa5d 100644
--- a/internal/codespaces/states.go
+++ b/internal/codespaces/states.go
@@ -54,7 +54,8 @@ func PollPostCreateStates(ctx context.Context, log logger, apiClient *api.API, u
 	}
 	localPort := listen.Addr().(*net.TCPAddr).Port
 
-	remoteSSHServerPort, sshUser, err := StartSSHServer(ctx, session, log)
+	log.Println("Fetching SSH Details...")
+	remoteSSHServerPort, sshUser, err := session.StartSSHServer(ctx)
 	if err != nil {
 		return fmt.Errorf("error getting ssh server details: %v", err)
 	}