diff --git a/build/gulpfile.sql.js b/build/gulpfile.sql.js
index f4c141d4db..8173c364a4 100644
--- a/build/gulpfile.sql.js
+++ b/build/gulpfile.sql.js
@@ -13,6 +13,10 @@ const del = require('del');
 const serviceDownloader = require('service-downloader').ServiceDownloadProvider;
 const platformInfo = require('service-downloader/out/platform').PlatformInformation;
 const path = require('path');
+const fs = require('fs');
+const rollup = require('rollup');
+const rollupNodeResolve = require('rollup-plugin-node-resolve');
+const rollupCommonJS = require('rollup-plugin-commonjs');
 
 gulp.task('clean-mssql-extension', util.rimraf('extensions/mssql/node_modules'));
 gulp.task('clean-credentials-extension', util.rimraf('extensions/credentials/node_modules'));
@@ -21,68 +25,74 @@ gulp.task('fmt', () => formatStagedFiles());
 const formatFiles = (some) => {
 	const formatting = es.map(function (file, cb) {
 
-			tsfmt.processString(file.path, file.contents.toString('utf8'), {
-				replace: true,
-				tsfmt: true,
-				tslint: true,
-				tsconfig: true
-				// verbose: true
-			}).then(result => {
-				console.info('ran formatting on file ' + file.path + ' result: ' + result.message);
-				if (result.error) {
-					console.error(result.message);
-				}
-				cb(null, file);
+		tsfmt.processString(file.path, file.contents.toString('utf8'), {
+			replace: true,
+			tsfmt: true,
+			tslint: true,
+			tsconfig: true
+			// verbose: true
+		}).then(result => {
+			console.info('ran formatting on file ' + file.path + ' result: ' + result.message);
+			if (result.error) {
+				console.error(result.message);
+			}
+			cb(null, file);
 
-			}, err => {
-				cb(err);
-			});
+		}, err => {
+			cb(err);
 		});
-	return gulp.src(some, { base: '.' })
-			.pipe(filter(f => !f.stat.isDirectory()))
-			.pipe(formatting);
+	});
+	return gulp.src(some, {
+			base: '.'
+		})
+		.pipe(filter(f => !f.stat.isDirectory()))
+		.pipe(formatting);
 
 };
 
 const formatStagedFiles = () => {
 	const cp = require('child_process');
-	cp.exec('git diff --name-only', { maxBuffer: 2000 * 1024 }, (err, out) => {
-			if (err) {
-				console.error();
-				console.error(err);
-				process.exit(1);
-			}
+	cp.exec('git diff --name-only', {
+		maxBuffer: 2000 * 1024
+	}, (err, out) => {
+		if (err) {
+			console.error();
+			console.error(err);
+			process.exit(1);
+		}
 
-			const some = out
-				.split(/\r?\n/)
-				.filter(l => !!l)
-				.filter(l => l.match(/.*.ts$/i));
+		const some = out
+			.split(/\r?\n/)
+			.filter(l => !!l)
+			.filter(l => l.match(/.*.ts$/i));
 
-			formatFiles(some).on('error', err => {
-				console.error();
-				console.error(err);
-				process.exit(1);
-			});
+		formatFiles(some).on('error', err => {
+			console.error();
+			console.error(err);
+			process.exit(1);
 		});
+	});
 
-	cp.exec('git diff --cached --name-only', { maxBuffer: 2000 * 1024 }, (err, out) => {
-			if (err) {
-				console.error();
-				console.error(err);
-				process.exit(1);
-			}
+	cp.exec('git diff --cached --name-only', {
+		maxBuffer: 2000 * 1024
+	}, (err, out) => {
+		if (err) {
+			console.error();
+			console.error(err);
+			process.exit(1);
+		}
 
-			const some = out
-				.split(/\r?\n/)
-				.filter(l => !!l)
-				.filter(l => l.match(/.*.ts$/i));
+		const some = out
+			.split(/\r?\n/)
+			.filter(l => !!l)
+			.filter(l => l.match(/.*.ts$/i));
 
-			formatFiles(some).on('error', err => {
-				console.error();
-				console.error(err);
-				process.exit(1);
-			});
+		formatFiles(some).on('error', err => {
+			console.error();
+			console.error(err);
+			process.exit(1);
 		});
+	});
 };
 
 function installService() {
@@ -129,3 +139,60 @@ function installSsmsMin() {
 gulp.task('install-ssmsmin', () => {
 	return installSsmsMin();
 });
+
+async function rollupModule(options) {
+	const moduleName = options.moduleName;
+	try {
+		const inputFile = options.inputFile;
+		const outputDirectory = options.outputDirectory;
+
+		await fs.promises.mkdir(outputDirectory, {
+			recursive: true
+		});
+
+		const outputFileName = options.outputFileName;
+		const outputMapName = `${outputFileName}.map`;
+		const external = options.external || [];
+
+		const outputFilePath = path.resolve(outputDirectory, outputFileName);
+		const outputMapPath = path.resolve(outputDirectory, outputMapName);
+
+		const bundle = await rollup.rollup({
+			input: inputFile,
+			plugins: [
+				rollupNodeResolve(),
+				rollupCommonJS(),
+			],
+			external,
+		});
+
+		const generatedBundle = await bundle.generate({
+			output: {
+				name: moduleName
+			},
+			format: 'umd',
+			sourcemap: true
+		});
+
+		const result = generatedBundle.output[0];
+		result.code = result.code + '\n//# sourceMappingURL=' + path.basename(outputMapName);
+
+		await fs.promises.writeFile(outputFilePath, result.code);
+		await fs.promises.writeFile(outputMapPath, result.map);
+
+		return {
+			name: moduleName,
+			result: true
+		};
+	} catch (ex) {
+		return {
+			name: moduleName,
+			result: false,
+			exception: ex
+		};
+	}
+}
+
+module.exports = {
+	rollupModule
+};
diff --git a/build/package.json b/build/package.json
index a1d7a65f69..5648107cd2 100644
--- a/build/package.json
+++ b/build/package.json
@@ -41,6 +41,9 @@
     "mime": "^1.3.4",
     "minimist": "^1.2.0",
     "request": "^2.85.0",
+    "rollup": "^1.20.3",
+    "rollup-plugin-commonjs": "^10.1.0",
+    "rollup-plugin-node-resolve": "^5.2.0",
     "terser": "4.3.1",
     "tslint": "^5.9.1",
     "service-downloader": "github:anthonydresser/service-downloader#0.1.7",
diff --git a/build/yarn.lock b/build/yarn.lock
index fa92c53bdc..5e28180033 100644
--- a/build/yarn.lock
+++ b/build/yarn.lock
@@ -68,6 +68,11 @@
   dependencies:
     "@types/node" "*"
 
+"@types/estree@0.0.39":
+  version "0.0.39"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
+  integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
+
 "@types/events@*":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86"
@@ -192,6 +197,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.13.tgz#ac786d623860adf39a3f51d629480aacd6a6eec7"
   integrity sha512-yN/FNNW1UYsRR1wwAoyOwqvDuLDtVXnaJTZ898XIw/Q5cCaeVAlVwvsmXLX5PuiScBYwZsZU4JYSHB3TvfdwvQ==
 
+"@types/node@^12.7.5":
+  version "12.7.8"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.8.tgz#cb1bf6800238898bc2ff6ffa5702c3cadd350708"
+  integrity sha512-FMdVn84tJJdV+xe+53sYiZS4R5yn1mAIxfj+DVoNiQjTYz1+OYmjwEZr1ev9nU0axXwda0QDbYl06QHanRVH3A==
+
 "@types/pump@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@types/pump/-/pump-1.0.1.tgz#ae8157cefef04d1a4d24c1cc91d403c2f5da5cd0"
@@ -209,6 +219,13 @@
     "@types/node" "*"
     "@types/tough-cookie" "*"
 
+"@types/resolve@0.0.8":
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194"
+  integrity sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==
+  dependencies:
+    "@types/node" "*"
+
 "@types/rimraf@^2.0.2":
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.2.tgz#7f0fc3cf0ff0ad2a99bb723ae1764f30acaf8b6e"
@@ -300,6 +317,11 @@ acorn@4.X:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
   integrity sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=
 
+acorn@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c"
+  integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==
+
 agent-base@4, agent-base@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
@@ -702,6 +724,11 @@ builtin-modules@^1.1.1:
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
   integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
 
+builtin-modules@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.1.0.tgz#aad97c15131eb76b65b50ef208e7584cd76a7484"
+  integrity sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==
+
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -1247,6 +1274,11 @@ esprima@^4.0.0:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
+estree-walker@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
+  integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==
+
 esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
@@ -2009,6 +2041,11 @@ is-glob@^4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
+is-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
+  integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
+
 is-natural-number@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8"
@@ -2057,6 +2094,13 @@ is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
+is-reference@^1.1.2:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.1.4.tgz#3f95849886ddb70256a3e6d062b1a68c13c51427"
+  integrity sha512-uJA/CDPO3Tao3GTrxYn6AwkM4nUPJiGGYu5+cB8qbC7WGFlrKZbiRo7SFKxUAEpFUfiHofWCXBUNhvYJMh+6zw==
+  dependencies:
+    "@types/estree" "0.0.39"
+
 is-relative@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
@@ -2337,6 +2381,13 @@ lodash@^4.15.0, lodash@^4.17.10:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
+magic-string@^0.25.2:
+  version "0.25.3"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.3.tgz#34b8d2a2c7fec9d9bdf9929a3fd81d271ef35be9"
+  integrity sha512-6QK0OpF/phMz0Q2AxILkX2mFhi7m+WMwTRg0LQKq/WBB0cDP4rYH3Wp4/d3OTXlrPLVJT/RFqj8tFeAR4nk8AA==
+  dependencies:
+    sourcemap-codec "^1.4.4"
+
 make-dir@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -2755,7 +2806,7 @@ path-is-inside@^1.0.1:
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
   integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
 
-path-parse@^1.0.5:
+path-parse@^1.0.5, path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
@@ -3014,6 +3065,13 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
+resolve@^1.11.0, resolve@^1.11.1:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6"
+  integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==
+  dependencies:
+    path-parse "^1.0.6"
+
 resolve@^1.3.2:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
@@ -3043,6 +3101,44 @@ rimraf@^2.2.8, rimraf@^2.6.1:
   dependencies:
     glob "^7.1.3"
 
+rollup-plugin-commonjs@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-10.1.0.tgz#417af3b54503878e084d127adf4d1caf8beb86fb"
+  integrity sha512-jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q==
+  dependencies:
+    estree-walker "^0.6.1"
+    is-reference "^1.1.2"
+    magic-string "^0.25.2"
+    resolve "^1.11.0"
+    rollup-pluginutils "^2.8.1"
+
+rollup-plugin-node-resolve@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz#730f93d10ed202473b1fb54a5997a7db8c6d8523"
+  integrity sha512-jUlyaDXts7TW2CqQ4GaO5VJ4PwwaV8VUGA7+km3n6k6xtOEacf61u0VXwN80phY/evMcaS+9eIeJ9MOyDxt5Zw==
+  dependencies:
+    "@types/resolve" "0.0.8"
+    builtin-modules "^3.1.0"
+    is-module "^1.0.0"
+    resolve "^1.11.1"
+    rollup-pluginutils "^2.8.1"
+
+rollup-pluginutils@^2.8.1:
+  version "2.8.2"
+  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
+  integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==
+  dependencies:
+    estree-walker "^0.6.1"
+
+rollup@^1.20.3:
+  version "1.21.4"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.21.4.tgz#00a41a30f90095db890301b226cbe2918e4cf54d"
+  integrity sha512-Pl512XVCmVzgcBz5h/3Li4oTaoDcmpuFZ+kdhS/wLreALz//WuDAMfomD3QEYl84NkDu6Z6wV9twlcREb4qQsw==
+  dependencies:
+    "@types/estree" "0.0.39"
+    "@types/node" "^12.7.5"
+    acorn "^7.0.0"
+
 run-parallel@^1.1.9:
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
@@ -3227,6 +3323,11 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
+sourcemap-codec@^1.4.4:
+  version "1.4.6"
+  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.6.tgz#e30a74f0402bad09807640d39e971090a08ce1e9"
+  integrity sha512-1ZooVLYFxC448piVLBbtOxFcXwnymH9oUF8nRd3CuYDVvkRBxRl6pB4Mtas5a4drtL+E8LDgFkQNcgIw6tc8Hg==
+
 sparkles@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c"
diff --git a/src/sql/base/browser/ui/table/plugins/cellRangeSelector.ts b/src/sql/base/browser/ui/table/plugins/cellRangeSelector.ts
index 3cdfc51c3b..3f8445039c 100644
--- a/src/sql/base/browser/ui/table/plugins/cellRangeSelector.ts
+++ b/src/sql/base/browser/ui/table/plugins/cellRangeSelector.ts
@@ -49,7 +49,6 @@ export class CellRangeSelector<T> implements ICellRangeSelector<T> {
 	public onAppendCellRangeSelected = new Slick.Event<Slick.Range>();
 
 	constructor(private options: ICellRangeSelectorOptions) {
-		require.__$__nodeRequire('slickgrid/plugins/slick.cellrangedecorator');
 
 		this.options = mixin(this.options, defaultOptions, false);
 	}
diff --git a/src/sql/setup.js b/src/sql/setup.js
index f99eaeae51..60beb48846 100644
--- a/src/sql/setup.js
+++ b/src/sql/setup.js
@@ -16,6 +16,7 @@ define(["require", "exports"], function (require) {
 	require.__$__nodeRequire('slickgrid/slick.grid');
 	require.__$__nodeRequire('slickgrid/slick.editors');
 	require.__$__nodeRequire('slickgrid/slick.dataview');
+	require.__$__nodeRequire('slickgrid/plugins/slick.cellrangedecorator');
 	require.__$__nodeRequire('reflect-metadata');
 	require.__$__nodeRequire('zone.js');
 	require.__$__nodeRequire('chart.js');
diff --git a/src/sql/workbench/api/browser/extensionHost.contribution.common.ts b/src/sql/workbench/api/browser/extensionHost.contribution.ts
similarity index 100%
rename from src/sql/workbench/api/browser/extensionHost.contribution.common.ts
rename to src/sql/workbench/api/browser/extensionHost.contribution.ts
diff --git a/src/sql/workbench/api/electron-browser/mainThreadModelViewDialog.ts b/src/sql/workbench/api/browser/mainThreadModelViewDialog.ts
similarity index 100%
rename from src/sql/workbench/api/electron-browser/mainThreadModelViewDialog.ts
rename to src/sql/workbench/api/browser/mainThreadModelViewDialog.ts
diff --git a/src/sql/workbench/api/electron-browser/extensionHost.contribution.ts b/src/sql/workbench/api/electron-browser/extensionHost.contribution.ts
deleted file mode 100644
index a9f044cdd9..0000000000
--- a/src/sql/workbench/api/electron-browser/extensionHost.contribution.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-// --- SQL contributions
-import 'sql/workbench/api/browser/mainThreadConnectionManagement';
-import 'sql/workbench/api/browser/mainThreadCredentialManagement';
-import 'sql/workbench/api/browser/mainThreadDataProtocol';
-import 'sql/workbench/api/browser/mainThreadObjectExplorer';
-import 'sql/workbench/api/browser/mainThreadBackgroundTaskManagement';
-import 'sql/workbench/api/browser/mainThreadResourceProvider';
-import 'sql/workbench/api/browser/mainThreadTasks';
-import 'sql/workbench/api/browser/mainThreadDashboard';
-import 'sql/workbench/api/browser/mainThreadDashboardWebview';
-import 'sql/workbench/api/browser/mainThreadQueryEditor';
-import 'sql/workbench/api/browser/mainThreadModelView';
-import 'sql/workbench/api/electron-browser/mainThreadModelViewDialog';
-import 'sql/workbench/api/browser/mainThreadNotebook';
-import 'sql/workbench/api/browser/mainThreadNotebookDocumentsAndEditors';
-import 'sql/workbench/api/browser/mainThreadAccountManagement';
-import 'sql/workbench/api/browser/mainThreadExtensionManagement';
diff --git a/src/sql/workbench/parts/notebook/browser/outputs/gridOutput.component.ts b/src/sql/workbench/parts/notebook/browser/outputs/gridOutput.component.ts
index a59495982c..50d5c240cd 100644
--- a/src/sql/workbench/parts/notebook/browser/outputs/gridOutput.component.ts
+++ b/src/sql/workbench/parts/notebook/browser/outputs/gridOutput.component.ts
@@ -138,7 +138,7 @@ class DataResourceTable extends GridTableBase<any> {
 		@IEditorService editorService: IEditorService,
 		@IUntitledEditorService untitledEditorService: IUntitledEditorService,
 		@IConfigurationService configurationService: IConfigurationService,
-		@optional(ISerializationService) private _serializationService: ISerializationService
+		@ISerializationService private _serializationService: ISerializationService
 	) {
 		super(state, createResultSet(source), contextMenuService, instantiationService, editorService, untitledEditorService, configurationService);
 		this._gridDataProvider = this.instantiationService.createInstance(DataResourceDataProvider, source, this.resultSet, documentUri);
@@ -153,7 +153,7 @@ class DataResourceTable extends GridTableBase<any> {
 	}
 
 	protected getContextActions(): IAction[] {
-		if (!this._serializationService || !this._serializationService.hasProvider()) {
+		if (!this._serializationService.hasProvider()) {
 			return [];
 		}
 		return [
@@ -180,7 +180,7 @@ class DataResourceDataProvider implements IGridDataProvider {
 		@IClipboardService private _clipboardService: IClipboardService,
 		@IConfigurationService private _configurationService: IConfigurationService,
 		@ITextResourcePropertiesService private _textResourcePropertiesService: ITextResourcePropertiesService,
-		@optional(ISerializationService) private _serializationService: ISerializationService,
+		@ISerializationService private _serializationService: ISerializationService,
 		@IInstantiationService private _instantiationService: IInstantiationService
 	) {
 		this.transformSource(source);
@@ -248,7 +248,7 @@ class DataResourceDataProvider implements IGridDataProvider {
 	}
 
 	get canSerialize(): boolean {
-		return this._serializationService && this._serializationService.hasProvider();
+		return this._serializationService.hasProvider();
 	}
 
 
diff --git a/src/sql/workbench/test/electron-browser/api/mainThreadModelViewDialog.test.ts b/src/sql/workbench/test/electron-browser/api/mainThreadModelViewDialog.test.ts
index 54232ac64f..640a67c25f 100644
--- a/src/sql/workbench/test/electron-browser/api/mainThreadModelViewDialog.test.ts
+++ b/src/sql/workbench/test/electron-browser/api/mainThreadModelViewDialog.test.ts
@@ -5,7 +5,7 @@
 
 import * as assert from 'assert';
 import { Mock, It, Times } from 'typemoq';
-import { MainThreadModelViewDialog } from 'sql/workbench/api/electron-browser/mainThreadModelViewDialog';
+import { MainThreadModelViewDialog } from 'sql/workbench/api/browser/mainThreadModelViewDialog';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 import { IModelViewButtonDetails, IModelViewTabDetails, IModelViewDialogDetails, IModelViewWizardPageDetails, IModelViewWizardDetails, DialogMessage, MessageLevel } from 'sql/workbench/api/common/sqlExtHostTypes';
 import { CustomDialogService } from 'sql/platform/dialog/browser/customDialogService';
diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
index 5cb97af4c8..57cd734c2a 100644
--- a/src/vs/platform/product/common/product.ts
+++ b/src/vs/platform/product/common/product.ts
@@ -22,6 +22,7 @@ if (isWeb) {
 	if (Object.keys(product).length === 0) {
 		assign(product, {
 			version: '1.39.0-dev',
+			vscodeVersion: '1.39.0-dev',
 			nameLong: 'Visual Studio Code Web Dev',
 			nameShort: 'VSCode Web Dev'
 		});
diff --git a/src/vs/workbench/api/node/extHost.services.ts b/src/vs/workbench/api/node/extHost.services.ts
index 571d770311..61f3e795ba 100644
--- a/src/vs/workbench/api/node/extHost.services.ts
+++ b/src/vs/workbench/api/node/extHost.services.ts
@@ -37,7 +37,7 @@ registerSingleton(IExtHostCommands, ExtHostCommands);
 registerSingleton(IExtHostDocumentsAndEditors, ExtHostDocumentsAndEditors);
 registerSingleton(IExtHostTerminalService, ExtHostTerminalService);
 registerSingleton(IExtHostTask, ExtHostTask);
-registerSingleton(IExtHostDebugService, ExtHostDebugService);
+// registerSingleton(IExtHostDebugService, ExtHostDebugService); {{SQL CARBON EDIT}} remove debug service
 registerSingleton(IExtHostSearch, ExtHostSearch);
 registerSingleton(IExtensionStoragePaths, ExtensionStoragePaths);
 registerSingleton(IExtHostExtensionService, ExtHostExtensionService);
diff --git a/src/vs/workbench/services/environment/browser/environmentService.ts b/src/vs/workbench/services/environment/browser/environmentService.ts
index ae07deca71..98b3dff758 100644
--- a/src/vs/workbench/services/environment/browser/environmentService.ts
+++ b/src/vs/workbench/services/environment/browser/environmentService.ts
@@ -78,7 +78,7 @@ export class BrowserWorkbenchEnvironmentService implements IWorkbenchEnvironment
 		this.logsPath = options.logsPath.path;
 		this.logFile = joinPath(options.logsPath, 'window.log');
 		this.appRoot = '/web/';
-		this.appNameLong = 'Visual Studio Code - Web';
+		this.appNameLong = 'Azure Data Studio - Web'; // {{SQL CARBON EDIT}} vscode to ads
 
 		this.configuration.remoteAuthority = options.remoteAuthority;
 		this.configuration.machineId = generateUuid();
diff --git a/src/vs/workbench/services/extensions/worker/extHost.services.ts b/src/vs/workbench/services/extensions/worker/extHost.services.ts
index de6124dc48..123570eb36 100644
--- a/src/vs/workbench/services/extensions/worker/extHost.services.ts
+++ b/src/vs/workbench/services/extensions/worker/extHost.services.ts
@@ -50,7 +50,7 @@ function NotImplementedProxy<T>(name: ServiceIdentifier<T>): { new(): T } {
 }
 registerSingleton(IExtHostTerminalService, WorkerExtHostTerminalService);
 registerSingleton(IExtHostTask, WorkerExtHostTask);
-registerSingleton(IExtHostDebugService, class extends NotImplementedProxy(IExtHostDebugService) { });
+// registerSingleton(IExtHostDebugService, class extends NotImplementedProxy(IExtHostDebugService) { }); {{SQL CARBON EDIT}} remove debug service
 registerSingleton(IExtHostSearch, class extends NotImplementedProxy(IExtHostSearch) { });
 registerSingleton(IExtensionStoragePaths, class extends NotImplementedProxy(IExtensionStoragePaths) {
 	whenReady = Promise.resolve();
diff --git a/src/vs/workbench/workbench.common.main.ts b/src/vs/workbench/workbench.common.main.ts
index 30641f25b0..96ddb72306 100644
--- a/src/vs/workbench/workbench.common.main.ts
+++ b/src/vs/workbench/workbench.common.main.ts
@@ -8,7 +8,7 @@
 import 'vs/editor/editor.all';
 
 import 'vs/workbench/api/browser/extensionHost.contribution';
-import 'sql/workbench/api/electron-browser/extensionHost.contribution'; // {{SQL CARBON EDIT}} @anthonydresser add our extension contributions
+import 'sql/workbench/api/browser/extensionHost.contribution'; // {{SQL CARBON EDIT}} @anthonydresser add our extension contributions
 import 'vs/workbench/browser/workbench.contribution';
 
 //#endregion