diff --git a/.vscode/launch.json b/.vscode/launch.json
index 6a9e1dffb..56d7c0f00 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -161,32 +161,6 @@
                 "order": 10
             }
         },
-        {
-            "name": "Perf Tests (*.perf.test.ts)",
-            "type": "extensionHost",
-            "request": "launch",
-            "runtimeExecutable": "${execPath}",
-            "args": [
-                "${workspaceFolder}/src/test/testMultiRootWkspc/perfTests",
-                "--enable-proposed-api",
-                "--extensionDevelopmentPath=${workspaceFolder}",
-                "--extensionTestsPath=${workspaceFolder}/out/test/index.node.js"
-            ],
-            "env": {
-                "CI_PYTHON_PATH": "<Python Path>",
-                "VSC_JUPYTER_PERF_TEST": "1",
-                "TEST_FILES_SUFFIX": "notebookCellExecution.perf.test",
-                "VSC_JUPYTER_TEST_TIMEOUT": "60000"
-            },
-            "sourceMaps": true,
-            "outFiles": ["${workspaceFolder}/out/**/*.js", "!${workspaceFolder}/**/node_modules**/*"],
-            "preLaunchTask": "Compile",
-            "skipFiles": ["<node_internals>/**"],
-            "presentation": {
-                "group": "2_tests",
-                "order": 12
-            }
-        },
         {
             "name": "Jedi LSP tests",
             "type": "extensionHost",
@@ -361,18 +335,6 @@
                 "order": 2
             }
         },
-        {
-            "name": "Python: Current File with iPython",
-            "type": "python",
-            "request": "launch",
-            "module": "IPython",
-            "console": "integratedTerminal",
-            "args": ["${file}"], // Additional args should be prefixed with a '--' first.
-            "presentation": {
-                "group": "3_misc",
-                "order": 3
-            }
-        },
         {
             "name": "Python: Current File",
             "type": "python",
diff --git a/CodeQL.yml b/CodeQL.yml
index 2ec7716fa..68524f5bd 100644
--- a/CodeQL.yml
+++ b/CodeQL.yml
@@ -1,3 +1,4 @@
+# Maintained by @rzhao271
 path_classifiers:
   test:
     # Classify all files in the top-level directory src/test as test code.
diff --git a/build/ci/addEnvPath.py b/build/ci/addEnvPath.py
deleted file mode 100644
index abad9ec3b..000000000
--- a/build/ci/addEnvPath.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-#Adds the virtual environment's executable path to json file
-
-import json,sys
-import os.path
-jsonPath = sys.argv[1]
-key = sys.argv[2]
-
-if os.path.isfile(jsonPath):
-    with open(jsonPath, 'r') as read_file:
-        data = json.load(read_file)
-else:
-    directory = os.path.dirname(jsonPath)
-    if not os.path.exists(directory):
-        os.makedirs(directory)
-        with open(jsonPath, 'w+') as read_file:
-            data = {}
-    data = {}
-with open(jsonPath, 'w') as outfile:
-    if key == 'condaExecPath':
-        data[key] = sys.argv[3]
-    else:
-        data[key] = sys.executable
-    json.dump(data, outfile, sort_keys=True, indent=4)
diff --git a/build/ci/component-gov.yaml b/build/ci/component-gov.yaml
deleted file mode 100644
index 372ccf0eb..000000000
--- a/build/ci/component-gov.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-pool:
-    vmImage: 'ubuntu-latest'
-
-steps:
-    - task: ComponentGovernanceComponentDetection@0
-      inputs:
-        scanType: 'Register'
-        verbosity: 'Verbose'
-        alertWarningLevel: 'High'
diff --git a/build/ci/static_analysis/credscan/CredScanSuppressions.json b/build/ci/static_analysis/credscan/CredScanSuppressions.json
deleted file mode 100644
index a3e8d5418..000000000
--- a/build/ci/static_analysis/credscan/CredScanSuppressions.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "tool": "Credential Scanner",
-    "suppressions": [
-        {
-            "file": "src\\test\\datascience\\serverConfigFiles\\jkey.key",
-            "_justification": "Key file used for testing purposes, it is not a key relating to anything real"
-        },
-        {
-            "file": "src\\test\\datascience\\serverConfigFiles\\remotePassword.py",
-            "_justification": "The secret in this file used here for testing."
-        }
-    ]
-}
diff --git a/build/ci/static_analysis/policheck/exceptions.mdb b/build/ci/static_analysis/policheck/exceptions.mdb
deleted file mode 100644
index d4a413f89..000000000
Binary files a/build/ci/static_analysis/policheck/exceptions.mdb and /dev/null differ
diff --git a/build/constants.js b/build/constants.js
index 5b34c42f0..cc6fa5cbe 100644
--- a/build/constants.js
+++ b/build/constants.js
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 'use strict';
 
-const util = require('./util');
-exports.ExtensionRootDir = util.ExtensionRootDir;
+const path = require('path');
+exports.ExtensionRootDir = path.dirname(__dirname);
 exports.isWindows = /^win/.test(process.platform);
 exports.isCI = process.env.TF_BUILD !== undefined || process.env.GITHUB_ACTIONS === 'true';
diff --git a/build/contributedFiles.json b/build/contributedFiles.json
deleted file mode 100644
index fe51488c7..000000000
--- a/build/contributedFiles.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
diff --git a/build/existingFiles.json b/build/existingFiles.json
deleted file mode 100644
index 5f8df5863..000000000
--- a/build/existingFiles.json
+++ /dev/null
@@ -1,555 +0,0 @@
-[
-    "src/platform/activation/activationService.ts",
-    "src/platform/activation/downloadChannelRules.ts",
-    "src/platform/activation/downloader.ts",
-    "src/platform/activation/hashVerifier.ts",
-    "src/platform/activation/interpreterDataService.ts",
-    "src/platform/activation/jedi.ts",
-    "src/platform/activation/languageServer/languageServer.ts",
-    "src/platform/activation/languageServer/languageServerFolderService.ts",
-    "src/platform/activation/languageServer/languageServerHashes.ts",
-    "src/platform/activation/languageServer/languageServerPackageRepository.ts",
-    "src/platform/activation/languageServer/languageServerPackageService.ts",
-    "src/platform/activation/platformData.ts",
-    "src/platform/activation/progress.ts",
-    "src/platform/activation/serviceRegistry.ts",
-    "src/platform/activation/types.ts",
-    "src/platform/api.ts",
-    "src/platform/application/diagnostics/applicationDiagnostics.ts",
-    "src/platform/application/diagnostics/base.ts",
-    "src/platform/application/diagnostics/checks/envPathVariable.ts",
-    "src/platform/application/diagnostics/checks/invalidDebuggerType.ts",
-    "src/platform/application/diagnostics/checks/invalidPythonPathInDebugger.ts",
-    "src/platform/application/diagnostics/checks/powerShellActivation.ts",
-    "src/platform/application/diagnostics/checks/pythonInterpreter.ts",
-    "src/platform/application/diagnostics/commands/base.ts",
-    "src/platform/application/diagnostics/commands/execVSCCommand.ts",
-    "src/platform/application/diagnostics/commands/factory.ts",
-    "src/platform/application/diagnostics/commands/ignore.ts",
-    "src/platform/application/diagnostics/commands/launchBrowser.ts",
-    "src/platform/application/diagnostics/commands/types.ts",
-    "src/platform/application/diagnostics/constants.ts",
-    "src/platform/application/diagnostics/filter.ts",
-    "src/platform/application/diagnostics/promptHandler.ts",
-    "src/platform/application/diagnostics/serviceRegistry.ts",
-    "src/platform/application/diagnostics/types.ts",
-    "src/platform/application/serviceRegistry.ts",
-    "src/platform/application/types.ts",
-    "src/platform/common/application/applicationEnvironment.ts",
-    "src/platform/common/application/applicationShell.ts",
-    "src/platform/common/application/commandManager.ts",
-    "src/platform/common/application/debugService.ts",
-    "src/platform/common/application/documentManager.ts",
-    "src/platform/common/application/extensions.ts",
-    "src/platform/common/application/terminalManager.ts",
-    "src/platform/common/application/types.ts",
-    "src/platform/common/application/workspace.ts",
-    "src/platform/common/configSettingMonitor.ts",
-    "src/platform/common/configSettings.ts",
-    "src/platform/common/configuration/service.ts",
-    "src/platform/common/constants.ts",
-    "src/platform/common/contextKey.ts",
-    "src/platform/common/editor.ts",
-    "src/platform/common/envFileParser.ts",
-    "src/platform/common/errors/errorUtils.ts",
-    "src/platform/common/errors/moduleNotInstalledError.ts",
-    "src/platform/common/extensions.ts",
-    "src/platform/common/featureDeprecationManager.ts",
-    "src/platform/common/helpers.ts",
-    "src/platform/common/installer/channelManager.ts",
-    "src/platform/common/installer/condaInstaller.ts",
-    "src/platform/common/installer/moduleInstaller.ts",
-    "src/platform/common/installer/pipEnvInstaller.ts",
-    "src/platform/common/installer/pipInstaller.ts",
-    "src/platform/common/installer/productInstaller.ts",
-    "src/platform/common/installer/productNames.ts",
-    "src/platform/common/installer/productPath.ts",
-    "src/platform/common/installer/productService.ts",
-    "src/platform/common/installer/serviceRegistry.ts",
-    "src/platform/common/installer/types.ts",
-    "src/platform/common/logger.ts",
-    "src/platform/common/markdown/restTextConverter.ts",
-    "src/platform/common/net/browser.ts",
-    "src/platform/common/net/httpClient.ts",
-    "src/platform/common/net/socket/socketCallbackHandler.ts",
-    "src/platform/common/net/socket/socketServer.ts",
-    "src/platform/common/net/socket/SocketStream.ts",
-    "src/platform/common/nuget/azureBlobStoreNugetRepository.ts",
-    "src/platform/common/nuget/nugetRepository.ts",
-    "src/platform/common/nuget/nugetService.ts",
-    "src/platform/common/nuget/types.ts",
-    "src/platform/common/open.ts",
-    "src/platform/common/persistentState.ts",
-    "src/platform/common/platform/constants.ts",
-    "src/platform/common/platform/fileSystem.ts",
-    "src/platform/common/platform/osinfo.ts",
-    "src/platform/common/platform/pathUtils.ts",
-    "src/platform/common/platform/platformService.ts",
-    "src/platform/common/platform/registry.ts",
-    "src/platform/common/platform/serviceRegistry.ts",
-    "src/platform/common/platform/types.ts",
-    "src/platform/common/process/constants.ts",
-    "src/platform/common/process/currentProcess.ts",
-    "src/platform/common/process/decoder.ts",
-    "src/platform/common/process/proc.ts",
-    "src/platform/common/process/processFactory.ts",
-    "src/platform/common/process/pythonExecutionFactory.ts",
-    "src/platform/common/process/pythonProcess.ts",
-    "src/platform/common/process/pythonToolService.ts",
-    "src/platform/common/process/serviceRegistry.ts",
-    "src/platform/common/process/types.ts",
-    "src/platform/common/serviceRegistry.ts",
-    "src/platform/common/terminal/activator/base.ts",
-    "src/platform/common/terminal/activator/index.ts",
-    "src/platform/common/terminal/activator/powershellFailedHandler.ts",
-    "src/platform/common/terminal/commandPrompt.ts",
-    "src/platform/common/terminal/environmentActivationProviders/baseActivationProvider.ts",
-    "src/platform/common/terminal/environmentActivationProviders/bash.ts",
-    "src/platform/common/terminal/environmentActivationProviders/commandPrompt.ts",
-    "src/platform/common/terminal/environmentActivationProviders/condaActivationProvider.ts",
-    "src/platform/common/terminal/environmentActivationProviders/pyenvActivationProvider.ts",
-    "src/platform/common/terminal/factory.ts",
-    "src/platform/common/terminal/helper.ts",
-    "src/platform/common/terminal/service.ts",
-    "src/platform/common/terminal/types.ts",
-    "src/platform/common/types.ts",
-    "src/platform/common/util.ts",
-    "src/platform/common/utils/async.ts",
-    "src/platform/common/utils/decorators.ts",
-    "src/platform/common/utils/enum.ts",
-    "src/platform/common/utils/fs.ts",
-    "src/platform/common/utils/localize.ts",
-    "src/platform/common/utils/logging.ts",
-    "src/platform/common/utils/misc.ts",
-    "src/platform/common/utils/platform.ts",
-    "src/platform/common/utils/random.ts",
-    "src/platform/common/utils/stopWatch.ts",
-    "src/platform/common/utils/string.ts",
-    "src/platform/common/utils/sysTypes.ts",
-    "src/platform/common/utils/text.ts",
-    "src/platform/common/utils/version.ts",
-    "src/platform/common/variables/environment.ts",
-    "src/platform/common/variables/environmentVariablesProvider.ts",
-    "src/platform/common/variables/serviceRegistry.ts",
-    "src/platform/common/variables/systemVariables.ts",
-    "src/platform/common/variables/sysTypes.ts",
-    "src/platform/common/variables/types.ts",
-    "src/platform/debugger/constants.ts",
-    "src/platform/debugger/extension/banner.ts",
-    "src/platform/debugger/extension/configuration/baseProvider.ts",
-    "src/platform/debugger/extension/configuration/configurationProviderUtils.ts",
-    "src/platform/debugger/extension/configuration/pythonV2Provider.ts",
-    "src/platform/debugger/extension/configuration/types.ts",
-    "src/platform/debugger/extension/hooks/childProcessAttachHandler.ts",
-    "src/platform/debugger/extension/hooks/childProcessAttachService.ts",
-    "src/platform/debugger/extension/hooks/constants.ts",
-    "src/platform/debugger/extension/hooks/eventHandlerDispatcher.ts",
-    "src/platform/debugger/extension/hooks/processTerminationHandler.ts",
-    "src/platform/debugger/extension/hooks/processTerminationService.ts",
-    "src/platform/debugger/extension/hooks/types.ts",
-    "src/platform/debugger/extension/serviceRegistry.ts",
-    "src/platform/debugger/extension/types.ts",
-    "src/platform/debugger/types.ts",
-    "src/extension.ts",
-    "src/platform/formatters/autoPep8Formatter.ts",
-    "src/platform/formatters/baseFormatter.ts",
-    "src/platform/formatters/blackFormatter.ts",
-    "src/platform/formatters/dummyFormatter.ts",
-    "src/platform/formatters/helper.ts",
-    "src/platform/formatters/lineFormatter.ts",
-    "src/platform/formatters/serviceRegistry.ts",
-    "src/platform/formatters/types.ts",
-    "src/platform/formatters/yapfFormatter.ts",
-    "src/platform/interpreter/configuration/interpreterComparer.ts",
-    "src/platform/interpreter/configuration/interpreterSelector.ts",
-    "src/platform/interpreter/configuration/pythonPathUpdaterService.ts",
-    "src/platform/interpreter/configuration/pythonPathUpdaterServiceFactory.ts",
-    "src/platform/interpreter/configuration/services/globalUpdaterService.ts",
-    "src/platform/interpreter/configuration/services/workspaceFolderUpdaterService.ts",
-    "src/platform/interpreter/configuration/services/workspaceUpdaterService.ts",
-    "src/platform/interpreter/configuration/types.ts",
-    "src/platform/interpreter/contracts.ts",
-    "src/platform/interpreter/display/index.ts",
-    "src/platform/interpreter/display/shebangCodeLensProvider.ts",
-    "src/platform/interpreter/helpers.ts",
-    "src/platform/interpreter/interpreterService.ts",
-    "src/platform/interpreter/interpreterVersion.ts",
-    "src/platform/interpreter/locators/helpers.ts",
-    "src/platform/interpreter/locators/index.ts",
-    "src/platform/interpreter/locators/services/baseVirtualEnvService.ts",
-    "src/platform/interpreter/locators/services/cacheableLocatorService.ts",
-    "src/platform/interpreter/locators/services/conda.ts",
-    "src/platform/interpreter/locators/services/condaEnvFileService.ts",
-    "src/platform/interpreter/locators/services/condaEnvService.ts",
-    "src/platform/interpreter/locators/services/condaHelper.ts",
-    "src/platform/interpreter/locators/services/condaService.ts",
-    "src/platform/interpreter/locators/services/currentPathService.ts",
-    "src/platform/interpreter/locators/services/globalVirtualEnvService.ts",
-    "src/platform/interpreter/locators/services/KnownPathsService.ts",
-    "src/platform/interpreter/locators/services/pipEnvService.ts",
-    "src/platform/interpreter/locators/services/windowsRegistryService.ts",
-    "src/platform/interpreter/locators/services/workspaceVirtualEnvService.ts",
-    "src/platform/interpreter/serviceRegistry.ts",
-    "src/platform/interpreter/virtualEnvs/index.ts",
-    "src/platform/interpreter/virtualEnvs/types.ts",
-    "src/platform/ioc/container.ts",
-    "src/platform/ioc/index.ts",
-    "src/platform/ioc/serviceManager.ts",
-    "src/platform/ioc/types.ts",
-    "src/platform/jupyter/provider.ts",
-    "src/platform/language/braceCounter.ts",
-    "src/platform/language/characters.ts",
-    "src/platform/language/characterStream.ts",
-    "src/platform/language/iterableTextRange.ts",
-    "src/platform/language/textBuilder.ts",
-    "src/platform/language/textIterator.ts",
-    "src/platform/language/textRangeCollection.ts",
-    "src/platform/language/tokenizer.ts",
-    "src/platform/language/types.ts",
-    "src/platform/language/unicode.ts",
-    "src/platform/languageServices/jediProxyFactory.ts",
-    "src/platform/languageServices/proposeLanguageServerBanner.ts",
-    "src/platform/linters/bandit.ts",
-    "src/platform/linters/baseLinter.ts",
-    "src/platform/linters/errorHandlers/baseErrorHandler.ts",
-    "src/platform/linters/errorHandlers/errorHandler.ts",
-    "src/platform/linters/errorHandlers/notInstalled.ts",
-    "src/platform/linters/errorHandlers/standard.ts",
-    "src/platform/linters/flake8.ts",
-    "src/platform/linters/linterCommands.ts",
-    "src/platform/linters/linterInfo.ts",
-    "src/platform/linters/linterManager.ts",
-    "src/platform/linters/lintingEngine.ts",
-    "src/platform/linters/mypy.ts",
-    "src/platform/linters/pycodestyle.ts",
-    "src/platform/linters/prospector.ts",
-    "src/platform/linters/pydocstyle.ts",
-    "src/platform/linters/pylama.ts",
-    "src/platform/linters/pylint.ts",
-    "src/platform/linters/serviceRegistry.ts",
-    "src/platform/linters/types.ts",
-    "src/platform/providers/codeActionsProvider.ts",
-    "src/platform/providers/completionProvider.ts",
-    "src/platform/providers/completionSource.ts",
-    "src/platform/providers/definitionProvider.ts",
-    "src/platform/providers/docStringFoldingProvider.ts",
-    "src/platform/providers/formatProvider.ts",
-    "src/platform/providers/hoverProvider.ts",
-    "src/platform/providers/importSortProvider.ts",
-    "src/platform/providers/itemInfoSource.ts",
-    "src/platform/providers/jediProxy.ts",
-    "src/platform/providers/linterProvider.ts",
-    "src/platform/providers/objectDefinitionProvider.ts",
-    "src/platform/providers/providerUtilities.ts",
-    "src/platform/providers/referenceProvider.ts",
-    "src/platform/providers/renameProvider.ts",
-    "src/platform/providers/replProvider.ts",
-    "src/platform/providers/serviceRegistry.ts",
-    "src/platform/providers/signatureProvider.ts",
-    "src/platform/providers/simpleRefactorProvider.ts",
-    "src/platform/providers/symbolProvider.ts",
-    "src/platform/providers/terminalProvider.ts",
-    "src/platform/providers/types.ts",
-    "src/platform/refactor/contracts.ts",
-    "src/platform/refactor/proxy.ts",
-    "src/telemetry/constants.ts",
-    "src/telemetry/index.ts",
-    "src/telemetry/types.ts",
-    "src/platform/terminals/activation.ts",
-    "src/platform/terminals/codeExecution/codeExecutionManager.ts",
-    "src/platform/terminals/codeExecution/djangoContext.ts",
-    "src/platform/terminals/codeExecution/djangoShellCodeExecution.ts",
-    "src/platform/terminals/codeExecution/helper.ts",
-    "src/platform/terminals/codeExecution/repl.ts",
-    "src/platform/terminals/codeExecution/terminalCodeExecution.ts",
-    "src/platform/terminals/serviceRegistry.ts",
-    "src/platform/terminals/types.ts",
-    "src/platform/typeFormatters/blockFormatProvider.ts",
-    "src/platform/typeFormatters/codeBlockFormatProvider.ts",
-    "src/platform/typeFormatters/contracts.ts",
-    "src/platform/typeFormatters/dispatcher.ts",
-    "src/platform/typeFormatters/onEnterFormatter.ts",
-    "src/platform/testing/codeLenses/main.ts",
-    "src/platform/testing/codeLenses/testFiles.ts",
-    "src/platform/testing/common/argumentsHelper.ts",
-    "src/platform/testing/common/constants.ts",
-    "src/platform/testing/common/debugLauncher.ts",
-    "src/platform/testing/common/managers/baseTestManager.ts",
-    "src/platform/testing/common/managers/testConfigurationManager.ts",
-    "src/platform/testing/common/runner.ts",
-    "src/platform/testing/common/services/configSettingService.ts",
-    "src/platform/testing/common/services/storageService.ts",
-    "src/platform/testing/common/services/testManagerService.ts",
-    "src/platform/testing/common/services/testResultsService.ts",
-    "src/platform/testing/common/services/workspaceTestManagerService.ts",
-    "src/platform/testing/common/testUtils.ts",
-    "src/platform/testing/common/testVisitors/flatteningVisitor.ts",
-    "src/platform/testing/common/testVisitors/folderGenerationVisitor.ts",
-    "src/platform/testing/common/testVisitors/resultResetVisitor.ts",
-    "src/platform/testing/common/types.ts",
-    "src/platform/testing/common/xUnitParser.ts",
-    "src/platform/testing/configuration.ts",
-    "src/platform/testing/configurationFactory.ts",
-    "src/platform/testing/display/main.ts",
-    "src/platform/testing/display/picker.ts",
-    "src/platform/testing/main.ts",
-    "src/platform/testing/nosetest/main.ts",
-    "src/platform/testing/nosetest/runner.ts",
-    "src/platform/testing/nosetest/services/argsService.ts",
-    "src/platform/testing/nosetest/services/discoveryService.ts",
-    "src/platform/testing/nosetest/services/parserService.ts",
-    "src/platform/testing/nosetest/testConfigurationManager.ts",
-    "src/platform/testing/pytest/main.ts",
-    "src/platform/testing/pytest/runner.ts",
-    "src/platform/testing/pytest/services/argsService.ts",
-    "src/platform/testing/pytest/services/discoveryService.ts",
-    "src/platform/testing/pytest/services/parserService.ts",
-    "src/platform/testing/pytest/testConfigurationManager.ts",
-    "src/platform/testing/serviceRegistry.ts",
-    "src/platform/testing/types.ts",
-    "src/platform/testing/unittest/helper.ts",
-    "src/platform/testing/unittest/main.ts",
-    "src/platform/testing/unittest/runner.ts",
-    "src/platform/testing/unittest/services/argsService.ts",
-    "src/platform/testing/unittest/services/discoveryService.ts",
-    "src/platform/testing/unittest/services/parserService.ts",
-    "src/platform/testing/unittest/socketServer.ts",
-    "src/platform/testing/unittest/testConfigurationManager.ts",
-    "src/platform/workspaceSymbols/contracts.ts",
-    "src/platform/workspaceSymbols/generator.ts",
-    "src/platform/workspaceSymbols/main.ts",
-    "src/platform/workspaceSymbols/parser.ts",
-    "src/platform/workspaceSymbols/provider.ts",
-    "src/server/dummy.ts",
-    "src/test/aaFirstTest/aaFirstTest.test.ts",
-    "src/test/activation/activationService.unit.test.ts",
-    "src/test/activation/downloadChannelRules.unit.test.ts",
-    "src/test/activation/downloader.unit.test.ts",
-    "src/test/activation/excludeFiles.ls.test.ts",
-    "src/test/activation/languageServer/languageServer.unit.test.ts",
-    "src/test/activation/languageServer/languageServerFolderService.unit.test.ts",
-    "src/test/activation/languageServer/languageServerPackageRepository.unit.test.ts",
-    "src/test/activation/languageServer/languageServerPackageService.test.ts",
-    "src/test/activation/languageServer/languageServerPackageService.unit.test.ts",
-    "src/test/activation/platformData.unit.test.ts",
-    "src/test/application/diagnostics/applicationDiagnostics.unit.test.ts",
-    "src/test/application/diagnostics/checks/envPathVariable.unit.test.ts",
-    "src/test/application/diagnostics/checks/invalidPythonPathInDebugger.unit.test.ts",
-    "src/test/application/diagnostics/checks/powerShellActivation.unit.test.ts",
-    "src/test/application/diagnostics/checks/pythonInterpreter.unit.test.ts",
-    "src/test/application/diagnostics/commands/factory.unit.test.ts",
-    "src/test/application/diagnostics/commands/ignore.unit.test.ts",
-    "src/test/application/diagnostics/commands/launchBrowser.unit.test.ts",
-    "src/test/application/diagnostics/filter.unit.test.ts",
-    "src/test/application/diagnostics/promptHandler.unit.test.ts",
-    "src/test/autocomplete/base.test.ts",
-    "src/test/autocomplete/pep484.test.ts",
-    "src/test/autocomplete/pep526.test.ts",
-    "src/test/ciConstants.ts",
-    "src/test/common.ts",
-    "src/test/common/configSettings.multiroot.test.ts",
-    "src/test/common/configSettings.test.ts",
-    "src/test/common/configSettings.unit.test.ts",
-    "src/test/common/configuration/service.test.ts",
-    "src/test/common/extensions.unit.test.ts",
-    "src/test/common/featureDeprecationManager.unit.test.ts",
-    "src/test/common/helpers.test.ts",
-    "src/test/common/installer.test.ts",
-    "src/test/common/installer/installer.invalidPath.unit.test.ts",
-    "src/test/common/installer/installer.unit.test.ts",
-    "src/test/common/installer/moduleInstaller.unit.test.ts",
-    "src/test/common/installer/productPath.unit.test.ts",
-    "src/test/common/localize.unit.test.ts",
-    "src/test/common/misc.test.ts",
-    "src/test/common/moduleInstaller.test.ts",
-    "src/test/common/net/httpClient.unit.test.ts",
-    "src/test/common/nuget/azureBobStoreRepository.test.ts",
-    "src/test/common/nuget/nugetRepository.unit.test.ts",
-    "src/test/common/nuget/nugetService.unit.test.ts",
-    "src/test/common/platform/filesystem.unit.test.ts",
-    "src/test/common/platform/osinfo.unit.test.ts",
-    "src/test/common/platform/platformService.unit.test.ts",
-    "src/test/common/process/currentProcess.test.ts",
-    "src/test/common/process/decoder.test.ts",
-    "src/test/common/process/execFactory.test.ts",
-    "src/test/common/process/proc.exec.test.ts",
-    "src/test/common/process/proc.observable.test.ts",
-    "src/test/common/process/proc.unit.test.ts",
-    "src/test/common/process/pythonProc.simple.multiroot.test.ts",
-    "src/test/common/socketCallbackHandler.test.ts",
-    "src/test/common/socketStream.test.ts",
-    "src/test/common/terminals/activation.bash.unit.test.ts",
-    "src/test/common/terminals/activation.commandPrompt.unit.test.ts",
-    "src/test/common/terminals/activation.conda.unit.test.ts",
-    "src/test/common/terminals/activation.unit.test.ts",
-    "src/test/common/terminals/activator/base.unit.test.ts",
-    "src/test/common/terminals/activator/index.unit.test.ts",
-    "src/test/common/terminals/activator/powerShellFailedHandler.unit.test.ts",
-    "src/test/common/terminals/commandPrompt.unit.test.ts",
-    "src/test/common/terminals/factory.unit.test.ts",
-    "src/test/common/terminals/helper.activation.unit.test.ts",
-    "src/test/common/terminals/helper.unit.test.ts",
-    "src/test/common/terminals/pyenvActivationProvider.unit.test.ts",
-    "src/test/common/terminals/service.unit.test.ts",
-    "src/test/common/utils/async.unit.test.ts",
-    "src/test/common/utils/platform.unit.test.ts",
-    "src/test/common/utils/string.unit.test.ts",
-    "src/test/common/utils/text.unit.test.ts",
-    "src/test/common/utils/version.unit.test.ts",
-    "src/test/common/variables/envVarsProvider.multiroot.test.ts",
-    "src/test/common/variables/envVarsService.test.ts",
-    "src/test/configuration/interpreterSelector.unit.test.ts",
-    "src/test/constants.ts",
-    "src/test/core.ts",
-    "src/test/debugger/capabilities.test.ts",
-    "src/test/debugger/common/constants.ts",
-    "src/test/debugger/common/debugStreamProvider.test.ts",
-    "src/test/debugger/common/protocoloLogger.test.ts",
-    "src/test/debugger/common/protocolparser.test.ts",
-    "src/test/debugger/common/protocolWriter.test.ts",
-    "src/test/debugger/debugClient.ts",
-    "src/test/debugger/envVars.test.ts",
-    "src/test/debugger/extension/banner.unit.test.ts",
-    "src/test/debugger/extension/configProvider/provider.attach.unit.test.ts",
-    "src/test/debugger/extension/configProvider/provider.unit.test.ts",
-    "src/test/debugger/extension/hooks/childProcessAttachHandler.unit.test.ts",
-    "src/test/debugger/extension/hooks/childProcessAttachService.unit.test.ts",
-    "src/test/debugger/extension/hooks/processTerminationHandler.unit.test.ts",
-    "src/test/debugger/extension/hooks/processTerminationService.test.ts",
-    "src/test/debugger/jupyter/helpers.unit.test.ts",
-    "src/test/debugger/launcherScriptProvider.unit.test.ts",
-    "src/test/debugger/misc.test.ts",
-    "src/test/debugger/portAndHost.test.ts",
-    "src/test/debugger/run.test.ts",
-    "src/test/debugger/utils.ts",
-    "src/test/debuggerTest.ts",
-    "src/test/definitions/hover.jedi.test.ts",
-    "src/test/definitions/hover.ls.test.ts",
-    "src/test/definitions/navigation.test.ts",
-    "src/test/definitions/parallel.jedi.test.ts",
-    "src/test/definitions/parallel.ls.test.ts",
-    "src/test/format/extension.dispatch.test.ts",
-    "src/test/format/extension.format.test.ts",
-    "src/test/format/extension.formatOnSave.test.ts",
-    "src/test/format/extension.lineFormatter.test.ts",
-    "src/test/format/extension.onEnterFormat.test.ts",
-    "src/test/format/extension.onTypeFormat.test.ts",
-    "src/test/format/extension.sort.test.ts",
-    "src/test/format/format.helper.test.ts",
-    "src/test/index.ts",
-    "src/test/initialize.ts",
-    "src/test/install/channelManager.channels.test.ts",
-    "src/test/install/channelManager.messages.test.ts",
-    "src/test/interpreters/condaEnvFileService.unit.test.ts",
-    "src/test/interpreters/condaEnvService.unit.test.ts",
-    "src/test/interpreters/condaHelper.unit.test.ts",
-    "src/test/interpreters/condaService.unit.test.ts",
-    "src/test/interpreters/currentPathService.unit.test.ts",
-    "src/test/interpreters/display.unit.test.ts",
-    "src/test/interpreters/helper.unit.test.ts",
-    "src/test/interpreters/interpreterService.unit.test.ts",
-    "src/test/interpreters/interpreterVersion.unit.test.ts",
-    "src/test/interpreters/knownPathService.unit.test.ts",
-    "src/test/interpreters/locators/helpers.unit.test.ts",
-    "src/test/interpreters/locators/index.unit.test.ts",
-    "src/test/interpreters/mocks.ts",
-    "src/test/interpreters/pipEnvService.unit.test.ts",
-    "src/test/interpreters/pythonPathUpdater.test.ts",
-    "src/test/interpreters/venv.unit.test.ts",
-    "src/test/interpreters/virtualEnvManager.unit.test.ts",
-    "src/test/interpreters/virtualEnvs/index.unit.test.ts",
-    "src/test/interpreters/windowsRegistryService.unit.test.ts",
-    "src/test/language/characterStream.test.ts",
-    "src/test/language/textIterator.test.ts",
-    "src/test/language/textRange.test.ts",
-    "src/test/language/textRangeCollection.test.ts",
-    "src/test/language/tokenizer.test.ts",
-    "src/test/linters/lint.args.test.ts",
-    "src/test/linters/lint.commands.test.ts",
-    "src/test/linters/lint.manager.test.ts",
-    "src/test/linters/lint.multiroot.test.ts",
-    "src/test/linters/lint.provider.test.ts",
-    "src/test/linters/lint.test.ts",
-    "src/test/linters/lintengine.test.ts",
-    "src/test/linters/mypy.unit.test.ts",
-    "src/test/linters/pylint.test.ts",
-    "src/test/markdown/restTextConverter.test.ts",
-    "src/test/mockClasses.ts",
-    "src/test/mocks/mementos.ts",
-    "src/test/mocks/moduleInstaller.ts",
-    "src/test/mocks/proc.ts",
-    "src/test/mocks/process.ts",
-    "src/test/mocks/vsc/arrays.ts",
-    "src/test/mocks/vsc/extHostedTypes.ts",
-    "src/test/mocks/vsc/index.ts",
-    "src/test/mocks/vsc/position.ts",
-    "src/test/mocks/vsc/range.ts",
-    "src/test/mocks/vsc/selection.ts",
-    "src/test/mocks/vsc/strings.ts",
-    "src/test/mocks/vsc/telemetryReporter.ts",
-    "src/test/mocks/vsc/uri.ts",
-    "src/test/performance/load.perf.test.ts",
-    "src/test/performanceTest.ts",
-    "src/test/providers/codeActionsProvider.test.ts",
-    "src/test/providers/completionSource.unit.test.ts",
-    "src/test/providers/foldingProvider.test.ts",
-    "src/test/providers/importSortProvider.unit.test.ts",
-    "src/test/providers/pythonSignatureProvider.unit.test.ts",
-    "src/test/providers/repl.unit.test.ts",
-    "src/test/providers/shebangCodeLenseProvider.test.ts",
-    "src/test/providers/symbolProvider.unit.test.ts",
-    "src/test/providers/terminal.unit.test.ts",
-    "src/test/pythonFiles/formatting/dummy.ts",
-    "src/test/refactor/extension.refactor.extract.method.test.ts",
-    "src/test/refactor/extension.refactor.extract.var.test.ts",
-    "src/test/refactor/rename.test.ts",
-    "src/test/serviceRegistry.ts",
-    "src/test/signature/signature.jedi.test.ts",
-    "src/test/signature/signature.ls.test.ts",
-    "src/test/standardTest.ts",
-    "src/test/stub.ts",
-    "src/test/terminals/codeExecution/codeExecutionManager.unit.test.ts",
-    "src/test/terminals/codeExecution/djangoShellCodeExect.unit.test.ts",
-    "src/test/terminals/codeExecution/helper.test.ts",
-    "src/test/terminals/codeExecution/terminalCodeExec.unit.test.ts",
-    "src/test/testRunner.ts",
-    "src/test/textUtils.ts",
-    "src/test/unittests.ts",
-    "src/test/testing/argsService.test.ts",
-    "src/test/testing/banners/languageServerSurvey.unit.test.ts",
-    "src/test/testing/banners/proposeNewLanguageServerBanner.unit.test.ts",
-    "src/test/testing/common/argsHelper.unit.test.ts",
-    "src/test/testing/common/debugLauncher.test.ts",
-    "src/test/testing/common/managers/testConfigurationManager.unit.test.ts",
-    "src/test/testing/common/services/configSettingService.unit.test.ts",
-    "src/test/testing/configuration.unit.test.ts",
-    "src/test/testing/configurationFactory.unit.test.ts",
-    "src/test/testing/debugger.test.ts",
-    "src/test/testing/display/main.test.ts",
-    "src/test/testing/helper.ts",
-    "src/test/testing/mocks.ts",
-    "src/test/testing/nosetest/nosetest.argsService.unit.test.ts",
-    "src/test/testing/nosetest/nosetest.discovery.unit.test.ts",
-    "src/test/testing/nosetest/nosetest.disovery.test.ts",
-    "src/test/testing/nosetest/nosetest.run.test.ts",
-    "src/test/testing/nosetest/nosetest.test.ts",
-    "src/test/testing/pytest/pytest_unittest_parser_data.ts",
-    "src/test/testing/pytest/pytest.argsService.unit.test.ts",
-    "src/test/testing/pytest/pytest.discovery.test.ts",
-    "src/test/testing/pytest/pytest.discovery.unit.test.ts",
-    "src/test/testing/pytest/pytest.run.test.ts",
-    "src/test/testing/pytest/pytest.test.ts",
-    "src/test/testing/pytest/pytest.testparser.unit.test.ts",
-    "src/test/testing/rediscover.test.ts",
-    "src/test/testing/serviceRegistry.ts",
-    "src/test/testing/stoppingDiscoverAndTest.test.ts",
-    "src/test/testing/unittest/unittest.argsService.unit.test.ts",
-    "src/test/testing/unittest/unittest.discovery.test.ts",
-    "src/test/testing/unittest/unittest.discovery.unit.test.ts",
-    "src/test/testing/unittest/unittest.run.test.ts",
-    "src/test/testing/unittest/unittest.test.ts",
-    "src/test/vscode-mock.ts",
-    "src/test/workspaceSymbols/common.ts",
-    "src/test/workspaceSymbols/multiroot.test.ts",
-    "src/test/workspaceSymbols/standard.test.ts"
-]
diff --git a/build/tslint-rules/baseRuleWalker.js b/build/tslint-rules/baseRuleWalker.js
deleted file mode 100644
index 4bd133db1..000000000
--- a/build/tslint-rules/baseRuleWalker.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-'use strict';
-
-const path = require('path');
-const Lint = require('tslint');
-const util = require('../util');
-class BaseRuleWalker extends Lint.RuleWalker {
-    shouldIgnoreCurrentFile(node, filesToIgnore) {
-        const sourceFile = node.getSourceFile();
-        if (sourceFile && sourceFile.fileName) {
-            const filename = path.resolve(util.ExtensionRootDir, sourceFile.fileName);
-            if (filesToIgnore.indexOf(filename.replace(/\//g, path.sep)) >= 0) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
-exports.BaseRuleWalker = BaseRuleWalker;
diff --git a/build/tslint-rules/messagesMustBeLocalizedRule.js b/build/tslint-rules/messagesMustBeLocalizedRule.js
deleted file mode 100644
index c4040342a..000000000
--- a/build/tslint-rules/messagesMustBeLocalizedRule.js
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-'use strict';
-
-const path = require('path');
-const Lint = require('tslint');
-const ts = require('typescript');
-const util = require('../util');
-const baseRuleWalker = require('./baseRuleWalker');
-const methodNames = [
-    // From IApplicationShell (vscode.window):
-    'showErrorMessage',
-    'showInformationMessage',
-    'showWarningMessage',
-    'setStatusBarMessage',
-    // From IOutputChannel (vscode.OutputChannel):
-    'appendLine',
-    'appendLine'
-];
-// tslint:ignore-next-line:no-suspicious-comments
-// TODO: Ideally we would not ignore any files.
-const ignoredFiles = util.getListOfFiles('unlocalizedFiles.json');
-const ignoredPrefix = path.normalize('src/test');
-const failureMessage =
-    'Messages must be localized in the Jupyter Extension (use src/platform/common/utils/localize.ts)';
-class NoStringLiteralsInMessages extends baseRuleWalker.BaseRuleWalker {
-    visitCallExpression(node) {
-        if (!this.shouldIgnoreNode(node)) {
-            node.arguments
-                .filter((arg) => ts.isStringLiteral(arg) || ts.isTemplateLiteral(arg))
-                .forEach((arg) => {
-                    this.addFailureAtNode(arg, failureMessage);
-                });
-        }
-        super.visitCallExpression(node);
-    }
-    shouldIgnoreCurrentFile(node) {
-        //console.log('');
-        //console.log(node.getSourceFile().fileName);
-        //console.log(ignoredFiles);
-        if (super.shouldIgnoreCurrentFile(node, ignoredFiles)) {
-            return true;
-        }
-        const sourceFile = node.getSourceFile();
-        if (sourceFile && sourceFile.fileName) {
-            if (sourceFile.fileName.startsWith(ignoredPrefix)) {
-                return true;
-            }
-        }
-        return false;
-    }
-    shouldIgnoreNode(node) {
-        if (this.shouldIgnoreCurrentFile(node)) {
-            return true;
-        }
-        if (!ts.isPropertyAccessExpression(node.expression)) {
-            return true;
-        }
-        const prop = node.expression;
-        if (methodNames.indexOf(prop.name.text) < 0) {
-            return true;
-        }
-        return false;
-    }
-}
-class Rule extends Lint.Rules.AbstractRule {
-    apply(sourceFile) {
-        return this.applyWithWalker(new NoStringLiteralsInMessages(sourceFile, this.getOptions()));
-    }
-}
-Rule.FAILURE_STRING = failureMessage;
-exports.Rule = Rule;
diff --git a/build/unlocalizedFiles.json b/build/unlocalizedFiles.json
deleted file mode 100644
index 6b6f453f0..000000000
--- a/build/unlocalizedFiles.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-    "src/platform/activation/activationService.ts",
-    "src/platform/common/installer/channelManager.ts",
-    "src/platform/common/installer/moduleInstaller.ts",
-    "src/platform/common/installer/productInstaller.ts",
-    "src/platform/debugger/extension/hooks/childProcessAttachService.ts",
-    "src/platform/formatters/baseFormatter.ts",
-    "src/platform/formatters/blackFormatter.ts",
-    "src/platform/interpreter/configuration/pythonPathUpdaterService.ts",
-    "src/platform/linters/errorHandlers/notInstalled.ts",
-    "src/platform/linters/errorHandlers/standard.ts",
-    "src/platform/linters/linterCommands.ts",
-    "src/platform/linters/prospector.ts",
-    "src/platform/providers/importSortProvider.ts",
-    "src/platform/providers/objectDefinitionProvider.ts",
-    "src/platform/providers/simpleRefactorProvider.ts",
-    "src/platform/pythonEnvironments/discovery/locators/services/pipEnvService.ts",
-    "src/platform/terminals/codeExecution/helper.ts",
-    "src/platform/testing/common/debugLauncher.ts",
-    "src/platform/testing/common/managers/baseTestManager.ts",
-    "src/platform/testing/common/services/discovery.ts",
-    "src/platform/testing/configuration.ts",
-    "src/platform/testing/display/main.ts",
-    "src/platform/testing/main.ts",
-    "src/platform/workspaceSymbols/generator.ts"
-]
diff --git a/build/util.js b/build/util.js
deleted file mode 100644
index 651301c2b..000000000
--- a/build/util.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-exports.ExtensionRootDir = path.dirname(__dirname);
-function getListOfFiles(filename) {
-    filename = path.normalize(filename);
-    if (!path.isAbsolute(filename)) {
-        filename = path.join(__dirname, filename);
-    }
-    const data = fs.readFileSync(filename).toString();
-    const files = JSON.parse(data);
-    return files.map((file) => {
-        return path.join(exports.ExtensionRootDir, file.replace(/\//g, path.sep));
-    });
-}
-exports.getListOfFiles = getListOfFiles;
diff --git a/build/webpack/fs-empty.js b/build/webpack/fs-empty.js
index 7790ba4d1..5575007d9 100644
--- a/build/webpack/fs-empty.js
+++ b/build/webpack/fs-empty.js
@@ -1,3 +1,4 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+// Used in build/webpack/webpack.extension.web.config.js
 'use strict';
diff --git a/build/webpack/plugins/less-plugin-base64.js b/build/webpack/plugins/less-plugin-base64.js
deleted file mode 100644
index 7c42013b4..000000000
--- a/build/webpack/plugins/less-plugin-base64.js
+++ /dev/null
@@ -1,64 +0,0 @@
-// Most of this was based on https://github.com/less/less-plugin-inline-urls
-// License for this was included in the ThirdPartyNotices-Repository.txt
-const less = require('less');
-
-class Base64MimeTypeNode {
-    constructor() {
-        this.value = 'image/svg+xml;base64';
-        this.type = 'Base64MimeTypeNode';
-    }
-
-    eval(context) {
-        return this;
-    }
-}
-
-class Base64Visitor {
-    constructor() {
-        this.visitor = new less.visitors.Visitor(this);
-
-        // Set to a preEval visitor to make sure this runs before
-        // any evals
-        this.isPreEvalVisitor = true;
-
-        // Make sure this is a replacing visitor so we remove the old data.
-        this.isReplacing = true;
-    }
-
-    run(root) {
-        return this.visitor.visit(root);
-    }
-
-    visitUrl(URLNode, visitArgs) {
-        // Return two new nodes in the call. One that has the mime type and other with the node. The data-uri
-        // evaluator will transform this into a base64 string
-        return new less.tree.Call(
-            'data-uri',
-            [new Base64MimeTypeNode(), URLNode.value],
-            URLNode.index || 0,
-            URLNode.currentFileInfo
-        );
-    }
-}
-/*
- * This was originally used to perform less on uris and turn them into base64 encoded so they can be loaded into
- * a webpack html. There's one caveat though. Less and webpack don't play well together. It runs the less at the root dir.
- * This means in order to use this in a less file, you need to qualify the urls as if they come from the root dir.
- * Example:
- * url("./foo.svg")
- * becomes
- * url("./src/datascience-ui/history-react/images/foo.svg")
- */
-class Base64Plugin {
-    constructor() {}
-
-    install(less, pluginManager) {
-        pluginManager.addVisitor(new Base64Visitor());
-    }
-
-    printUsage() {
-        console.log('Base64 Plugin. Add to your webpack.config.js as a plugin to convert URLs to base64 inline');
-    }
-}
-
-module.exports = Base64Plugin;
diff --git a/resources/walkthroughs/KernelPicker.gif b/resources/walkthroughs/KernelPicker.gif
deleted file mode 100644
index 949bd9da1..000000000
Binary files a/resources/walkthroughs/KernelPicker.gif and /dev/null differ
diff --git a/resources/walkthroughs/OpenOrCreateNotebook.gif b/resources/walkthroughs/OpenOrCreateNotebook.gif
deleted file mode 100644
index 98256a97f..000000000
Binary files a/resources/walkthroughs/OpenOrCreateNotebook.gif and /dev/null differ
diff --git a/resources/walkthroughs/dataviewerdark.gif b/resources/walkthroughs/dataviewerdark.gif
deleted file mode 100755
index 96072e17d..000000000
Binary files a/resources/walkthroughs/dataviewerdark.gif and /dev/null differ
diff --git a/resources/walkthroughs/interactive.gif b/resources/walkthroughs/interactive.gif
deleted file mode 100644
index f8080fa94..000000000
Binary files a/resources/walkthroughs/interactive.gif and /dev/null differ
diff --git a/src/kernels/raw/session/rawKernelConnection.node.ts b/src/kernels/raw/session/rawKernelConnection.node.ts
index 46db862d1..95defc715 100644
--- a/src/kernels/raw/session/rawKernelConnection.node.ts
+++ b/src/kernels/raw/session/rawKernelConnection.node.ts
@@ -14,7 +14,7 @@ import {
     isUserRegisteredKernelSpecConnection
 } from '../../../kernels/helpers';
 import { IWebSocketLike } from '../../common/kernelSocketWrapper';
-import { IKernelLauncher, IKernelProcess } from '../types';
+import { IKernelConnection, IKernelLauncher, IKernelProcess } from '../types';
 import { RawSocket } from './rawSocket.node';
 import { IKernelSocket, LocalKernelConnectionMetadata } from '../../types';
 import { suppressShutdownErrors } from '../../common/baseJupyterSession';
@@ -155,8 +155,7 @@ export class RawKernelConnection implements Kernel.IKernelConnection {
                 throw new CancellationError();
             }
             this.hookupKernelProcessExitHandler(kernelProcess);
-            const result = newRawKernel(this.kernelProcess, this.clientId, this.username, this.model);
-            this.kernelProcess = result.kernelProcess;
+            const result = newRawKernel(kernelProcess.connection, this.clientId, this.username, this.model);
             this.realKernel = result.realKernel;
             this.socket = result.socket;
             this.socket.emit('open');
@@ -563,7 +562,7 @@ async function postStartKernel(
         */
 }
 
-function newRawKernel(kernelProcess: IKernelProcess, clientId: string, username: string, model: Kernel.IModel) {
+function newRawKernel(connection: IKernelConnection, clientId: string, username: string, model: Kernel.IModel) {
     const jupyterLab = require('@jupyterlab/services') as typeof import('@jupyterlab/services'); // NOSONAR
     const jupyterLabSerialize =
         require('@jupyterlab/services/lib/kernel/serialize') as typeof import('@jupyterlab/services/lib/kernel/serialize'); // NOSONAR
@@ -573,7 +572,7 @@ function newRawKernel(kernelProcess: IKernelProcess, clientId: string, username:
     let socketInstance: IKernelSocket & IWebSocketLike & IDisposable;
     class RawSocketWrapper extends RawSocket {
         constructor() {
-            super(kernelProcess.connection, jupyterLabSerialize.serialize, jupyterLabSerialize.deserialize);
+            super(connection, jupyterLabSerialize.serialize, jupyterLabSerialize.deserialize);
             socketInstance = this;
         }
     }
@@ -602,7 +601,7 @@ function newRawKernel(kernelProcess: IKernelProcess, clientId: string, username:
     });
 
     // Use this real kernel in result.
-    return { realKernel, socket: socketInstance!, kernelProcess };
+    return { realKernel, socket: socketInstance! };
 }
 
 /**