diff --git a/.vscode/launch.json b/.vscode/launch.json
index 270395ae14..34b28e7083 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -16,21 +16,6 @@
       ],
       "preLaunchTask": "Build"
     },
-    {
-      "name": "Launch Extension (Build client only)",
-      "type": "extensionHost",
-      "request": "launch",
-      "runtimeExecutable": "${execPath}",
-      "args": [
-        "--extensionDevelopmentPath=${workspaceFolder}"
-      ],
-      "stopOnEntry": false,
-      "sourceMaps": true,
-      "outFiles": [
-        "${workspaceFolder}/out/src/**/*.js"
-      ],
-      "preLaunchTask": "Build"
-    },
     {
       "name": "Launch Extension Tests",
       "type": "extensionHost",
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 75bd70aa16..5b0b6fb20f 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -40,28 +40,33 @@
       "label": "Restore",
       "type": "shell",
       "command": "Invoke-Build Restore",
+      "problemMatcher": []
     },
     {
       "label": "Clean",
       "type": "shell",
       "command": "Invoke-Build Clean",
+      "problemMatcher": []
     },
     {
       "label": "Build",
       "type": "shell",
       "command": "Invoke-Build Build",
-      "group": "build",
+      "problemMatcher": [],
+      "group": "build"
     },
     {
       "label": "Test",
       "type": "shell",
       "command": "Invoke-Build Test",
-      "group": "test",
+      "problemMatcher": [],
+      "group": "test"
     },
     {
       "label": "Package",
       "type": "shell",
       "command": "Invoke-Build Package",
+      "problemMatcher": [],
       "group": "build"
     }
   ]
diff --git a/src/features/DebugSession.ts b/src/features/DebugSession.ts
index 287969acf6..a401b6bbf1 100644
--- a/src/features/DebugSession.ts
+++ b/src/features/DebugSession.ts
@@ -18,6 +18,9 @@ import { LanguageClientConsumer } from "../languageClientConsumer";
 export const StartDebuggerNotificationType =
     new NotificationType<void>("powerShell/startDebugger");
 
+export const StopDebuggerNotificationType =
+    new NotificationType<void>("powerShell/stopDebugger");
+
 export class DebugSessionFeature extends LanguageClientConsumer
     implements DebugConfigurationProvider, vscode.DebugAdapterDescriptorFactory {
 
@@ -61,6 +64,12 @@ export class DebugSessionFeature extends LanguageClientConsumer
                     type: "PowerShell",
                     name: "PowerShell Interactive Session",
         }));
+
+        languageClient.onNotification(
+            StopDebuggerNotificationType,
+            () =>
+                vscode.debug.stopDebugging(undefined)
+        );
     }
 
     public async provideDebugConfigurations(