diff --git a/.vscode/settings.json b/.vscode/settings.json
index 48df651c887..6d4270cbf8f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -8,9 +8,10 @@
 		"**/.DS_Store": true,
 		".vscode-test": true,
 		"cli/target": true,
+		"build/**/*.js.map": true,
 		"build/**/*.js": {
 			"when": "$(basename).ts"
-		}
+		},
 	},
 	"files.associations": {
 		"cglicenses.json": "jsonc",
diff --git a/build/lib/optimize.js b/build/lib/optimize.js
index 7beeac2c6bf..87849248e19 100644
--- a/build/lib/optimize.js
+++ b/build/lib/optimize.js
@@ -19,6 +19,11 @@ const postcss_1 = require("./postcss");
 const esbuild = require("esbuild");
 const sourcemaps = require("gulp-sourcemaps");
 const REPO_ROOT_PATH = path.join(__dirname, '../..');
+const DEFAULT_FILE_HEADER = [
+    '/*!--------------------------------------------------------',
+    ' * Copyright (C) Microsoft Corporation. All rights reserved.',
+    ' *--------------------------------------------------------*/'
+].join('\n');
 function optimizeESMTask(opts) {
     const resourcesStream = es.through(); // this stream will contain the resources
     const bundlesStream = es.through(); // this stream will contain the bundled files
@@ -119,7 +124,6 @@ function optimizeESMTask(opts) {
                     files.push(new VinylFile(fileProps));
                 }
             });
-            // await task; // FORCE serial bundling (makes debugging easier)
             tasks.push(task);
         }
         await Promise.all(tasks);
diff --git a/build/lib/optimize.ts b/build/lib/optimize.ts
index 8da31db05dc..c07955f2981 100644
--- a/build/lib/optimize.ts
+++ b/build/lib/optimize.ts
@@ -39,6 +39,12 @@ export interface IOptimizeESMTaskOpts {
 	fileContentMapper?: (contents: string, path: string) => string;
 }
 
+const DEFAULT_FILE_HEADER = [
+	'/*!--------------------------------------------------------',
+	' * Copyright (C) Microsoft Corporation. All rights reserved.',
+	' *--------------------------------------------------------*/'
+].join('\n');
+
 function optimizeESMTask(opts: IOptimizeESMTaskOpts): NodeJS.ReadWriteStream {
 	const resourcesStream = es.through(); // this stream will contain the resources
 	const bundlesStream = es.through(); // this stream will contain the bundled files
@@ -158,7 +164,6 @@ function optimizeESMTask(opts: IOptimizeESMTaskOpts): NodeJS.ReadWriteStream {
 				}
 			});
 
-			// await task; // FORCE serial bundling (makes debugging easier)
 			tasks.push(task);
 		}