diff --git a/common/tools/dev-tool/src/util/customization/helpers/addFileHeaders.ts b/common/tools/dev-tool/src/util/customization/helpers/addFileHeaders.ts
index 451c81ac659e..1479f47b4e84 100644
--- a/common/tools/dev-tool/src/util/customization/helpers/addFileHeaders.ts
+++ b/common/tools/dev-tool/src/util/customization/helpers/addFileHeaders.ts
@@ -8,9 +8,9 @@ const licenseHeader = `// Copyright (c) Microsoft Corporation.
 const generatedCodeNotice = `
 /**
  * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- * 
+ *
  * Any changes you make here may be lost.
- * 
+ *
  * If you need to make changes, please do so in the original source file, \\{project-root\\}/sources/custom
  */`;
 
diff --git a/sdk/template/template-dpg/src/WidgetServiceClient.ts b/sdk/template/template-dpg/src/WidgetServiceClient.ts
index 955c1ee0f1a8..1f4ef7dac813 100644
--- a/sdk/template/template-dpg/src/WidgetServiceClient.ts
+++ b/sdk/template/template-dpg/src/WidgetServiceClient.ts
@@ -1,22 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
 /**
  * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
  *
diff --git a/sdk/template/template-dpg/src/api/WidgetServiceContext.ts b/sdk/template/template-dpg/src/api/WidgetServiceContext.ts
index 6c87478f5445..830c48b55bbe 100644
--- a/sdk/template/template-dpg/src/api/WidgetServiceContext.ts
+++ b/sdk/template/template-dpg/src/api/WidgetServiceContext.ts
@@ -1,22 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
 /**
  * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
  *
diff --git a/sdk/template/template-dpg/src/api/foo.ts b/sdk/template/template-dpg/src/api/foo.ts
index dd6498ff26b6..f3a89a8b0423 100644
--- a/sdk/template/template-dpg/src/api/foo.ts
+++ b/sdk/template/template-dpg/src/api/foo.ts
@@ -9,21 +9,6 @@
  * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
  */
 
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
 export function foo(): void {
   console.log("foo");
 }
diff --git a/sdk/template/template-dpg/src/api/index.ts b/sdk/template/template-dpg/src/api/index.ts
index 61bd6127bb47..3430a85b63cb 100644
--- a/sdk/template/template-dpg/src/api/index.ts
+++ b/sdk/template/template-dpg/src/api/index.ts
@@ -1,22 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
 /**
  * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
  *
diff --git a/sdk/template/template-dpg/src/api/models.ts b/sdk/template/template-dpg/src/api/models.ts
index 2947ce53a9ac..7f66dceb8e2d 100644
--- a/sdk/template/template-dpg/src/api/models.ts
+++ b/sdk/template/template-dpg/src/api/models.ts
@@ -1,22 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
 /**
  * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
  *
diff --git a/sdk/template/template-dpg/src/api/operations.ts b/sdk/template/template-dpg/src/api/operations.ts
index c737712710a7..1d54e2368d96 100644
--- a/sdk/template/template-dpg/src/api/operations.ts
+++ b/sdk/template/template-dpg/src/api/operations.ts
@@ -1,22 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
 /**
  * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
  *
diff --git a/sdk/template/template-dpg/src/common/interfaces.ts b/sdk/template/template-dpg/src/common/interfaces.ts
index 42052d033a8f..29bff9308ccf 100644
--- a/sdk/template/template-dpg/src/common/interfaces.ts
+++ b/sdk/template/template-dpg/src/common/interfaces.ts
@@ -1,22 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
 /**
  * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
  *
diff --git a/sdk/template/template-dpg/src/index.ts b/sdk/template/template-dpg/src/index.ts
index 6c48cc94bfca..25fd76e9dea4 100644
--- a/sdk/template/template-dpg/src/index.ts
+++ b/sdk/template/template-dpg/src/index.ts
@@ -1,22 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
 /**
  * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
  *
diff --git a/sdk/template/template-dpg/src/logger.ts b/sdk/template/template-dpg/src/logger.ts
index 8691ef7f9df3..ce71718e2637 100644
--- a/sdk/template/template-dpg/src/logger.ts
+++ b/sdk/template/template-dpg/src/logger.ts
@@ -1,22 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
 /**
  * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
  *
diff --git a/sdk/template/template-dpg/src/rest/clientDefinitions.ts b/sdk/template/template-dpg/src/rest/clientDefinitions.ts
index c5b7ce35e798..7782c5a4abe6 100644
--- a/sdk/template/template-dpg/src/rest/clientDefinitions.ts
+++ b/sdk/template/template-dpg/src/rest/clientDefinitions.ts
@@ -1,22 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
 /**
  * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
  *
diff --git a/sdk/template/template-dpg/src/rest/index.ts b/sdk/template/template-dpg/src/rest/index.ts
index 2d3b459a6fdf..d504574ffae4 100644
--- a/sdk/template/template-dpg/src/rest/index.ts
+++ b/sdk/template/template-dpg/src/rest/index.ts
@@ -1,22 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
 /**
  * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
  *
diff --git a/sdk/template/template-dpg/src/rest/isUnexpected.ts b/sdk/template/template-dpg/src/rest/isUnexpected.ts
index 12612999a36b..6fed4c26583a 100644
--- a/sdk/template/template-dpg/src/rest/isUnexpected.ts
+++ b/sdk/template/template-dpg/src/rest/isUnexpected.ts
@@ -1,22 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
 /**
  * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
  *
diff --git a/sdk/template/template-dpg/src/rest/models.ts b/sdk/template/template-dpg/src/rest/models.ts
index d06e148fbcc7..cf66cf4096d7 100644
--- a/sdk/template/template-dpg/src/rest/models.ts
+++ b/sdk/template/template-dpg/src/rest/models.ts
@@ -1,22 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
 /**
  * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
  *
diff --git a/sdk/template/template-dpg/src/rest/outputModels.ts b/sdk/template/template-dpg/src/rest/outputModels.ts
index 8ca44734a0ca..b82898eab96f 100644
--- a/sdk/template/template-dpg/src/rest/outputModels.ts
+++ b/sdk/template/template-dpg/src/rest/outputModels.ts
@@ -1,22 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
 /**
  * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
  *
diff --git a/sdk/template/template-dpg/src/rest/parameters.ts b/sdk/template/template-dpg/src/rest/parameters.ts
index 7b972a2fbf6d..ef0a9b69eee7 100644
--- a/sdk/template/template-dpg/src/rest/parameters.ts
+++ b/sdk/template/template-dpg/src/rest/parameters.ts
@@ -1,22 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
 /**
  * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
  *
diff --git a/sdk/template/template-dpg/src/rest/responses.ts b/sdk/template/template-dpg/src/rest/responses.ts
index 410207c57bdf..87cc22954084 100644
--- a/sdk/template/template-dpg/src/rest/responses.ts
+++ b/sdk/template/template-dpg/src/rest/responses.ts
@@ -1,22 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
 /**
  * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
  *
diff --git a/sdk/template/template-dpg/src/rest/widgetServiceClient.ts b/sdk/template/template-dpg/src/rest/widgetServiceClient.ts
index 2f1c1777ef13..47fec529a407 100644
--- a/sdk/template/template-dpg/src/rest/widgetServiceClient.ts
+++ b/sdk/template/template-dpg/src/rest/widgetServiceClient.ts
@@ -1,22 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
-/**
- * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
- *
- * Any changes you make here may be lost.
- *
- * If you need to make changes, please do so in the original source file, \{project-root\}/sources/custom
- */
-
 /**
  * THIS IS AN AUTO-GENERATED FILE - DO NOT EDIT!
  *