diff --git a/adev/src/content/tutorials/first-app/steps/01-hello-world/README.md b/adev/src/content/tutorials/first-app/steps/01-hello-world/README.md
index bdeae67f3bd3..69e6f2a67e08 100644
--- a/adev/src/content/tutorials/first-app/steps/01-hello-world/README.md
+++ b/adev/src/content/tutorials/first-app/steps/01-hello-world/README.md
@@ -94,11 +94,11 @@ In your IDE:
 1. Next, open  `first-app/src/app/app.ts`.
 1. In `app.ts`, in the `@Component` definition, replace the `template` line with this code to change the text in the app component.
 
-    <docs-code header="Replace in src/app/app.ts" path="adev/src/content/tutorials/first-app/steps/02-Home/src/app/app.ts" visibleLines="[7,9]"/>
+    <docs-code header="Replace in src/app/app.ts" path="adev/src/content/tutorials/first-app/steps/02-Home/src/app/app.ts" visibleLines="[6,8]"/>
 
 1. In `app.ts`, in the `App` class definition, replace the `title` line with this code to change the component title.
 
-    <docs-code header="Replace in src/app/app.ts" path="adev/src/content/tutorials/first-app/steps/02-Home/src/app/app.ts" visibleLines="[12,14]"/>
+    <docs-code header="Replace in src/app/app.ts" path="adev/src/content/tutorials/first-app/steps/02-Home/src/app/app.ts" visibleLines="[11,13]"/>
 
     Then, save the changes you made to `app.ts`.
 
diff --git a/adev/src/content/tutorials/first-app/steps/02-Home/README.md b/adev/src/content/tutorials/first-app/steps/02-Home/README.md
index 4007439832d6..c0556a316050 100644
--- a/adev/src/content/tutorials/first-app/steps/02-Home/README.md
+++ b/adev/src/content/tutorials/first-app/steps/02-Home/README.md
@@ -70,11 +70,11 @@ In the **Edit** pane of your IDE:
 
 1. In `app.ts`, in `@Component`, update the `imports` array property and add `Home`.
 
-    <docs-code header="Replace in src/app/app.ts" path="adev/src/content/tutorials/first-app/steps/03-HousingLocation/src/app/app.ts" visibleLines="[7]"/>
+    <docs-code header="Replace in src/app/app.ts" path="adev/src/content/tutorials/first-app/steps/03-HousingLocation/src/app/app.ts" visibleLines="[6]"/>
 
 1. In `app.ts`, in `@Component`, update the `template` property to include the following HTML code.
 
-    <docs-code header="Replace in src/app/app.ts" path="adev/src/content/tutorials/first-app/steps/03-HousingLocation/src/app/app.ts" visibleLines="[8,17]"/>
+    <docs-code header="Replace in src/app/app.ts" path="adev/src/content/tutorials/first-app/steps/03-HousingLocation/src/app/app.ts" visibleLines="[7,16]"/>
 
 1. Save your changes to  `app.ts`.
 1. If `ng serve` is running, the app should update.
@@ -100,7 +100,7 @@ In the **Edit** pane of your IDE:
 1. In the `first-app` directory, open `home.ts` in the editor.
 1. In `home.ts`, in `@Component`, update the `template` property with this code.
 
-    <docs-code header="Replace in src/app/home/home.ts" path="adev/src/content/tutorials/first-app/steps/03-HousingLocation/src/app/home/home.ts" visibleLines="[8,15]"/>
+    <docs-code header="Replace in src/app/home/home.ts" path="adev/src/content/tutorials/first-app/steps/03-HousingLocation/src/app/home/home.ts" visibleLines="[7,14]"/>
 
 1. Next, open `home.css` in the editor and update the content with these styles.
 
diff --git a/adev/src/content/tutorials/first-app/steps/03-HousingLocation/README.md b/adev/src/content/tutorials/first-app/steps/03-HousingLocation/README.md
index 91332a02c899..4d45d8b2d946 100644
--- a/adev/src/content/tutorials/first-app/steps/03-HousingLocation/README.md
+++ b/adev/src/content/tutorials/first-app/steps/03-HousingLocation/README.md
@@ -51,11 +51,11 @@ In the **Edit** pane of your IDE:
 
 1. Next update the `imports` property of the `@Component` metadata by adding `HousingLocation` to the array.
 
-    <docs-code header="Add HousingLocation to imports array in src/app/home/home.ts" path="adev/src/content/tutorials/first-app/steps/04-interfaces/src/app/home/home.ts" visibleLines="[7]"/>
+    <docs-code header="Add HousingLocation to imports array in src/app/home/home.ts" path="adev/src/content/tutorials/first-app/steps/04-interfaces/src/app/home/home.ts" visibleLines="[6]"/>
 
 1. Now the component is ready for use in the template for the `Home`. Update the `template` property of the `@Component` metadata to include a reference to the `<app-housing-location>` tag.
 
-    <docs-code header="Add housing location to the component template in src/app/home/home.ts" path="adev/src/content/tutorials/first-app/steps/04-interfaces/src/app/home/home.ts" visibleLines="[8,18]"/>
+    <docs-code header="Add housing location to the component template in src/app/home/home.ts" path="adev/src/content/tutorials/first-app/steps/04-interfaces/src/app/home/home.ts" visibleLines="[7,17]"/>
 
 </docs-step>
 
diff --git a/adev/src/content/tutorials/first-app/steps/04-interfaces/README.md b/adev/src/content/tutorials/first-app/steps/04-interfaces/README.md
index 548970bb50ec..d82c564d697f 100644
--- a/adev/src/content/tutorials/first-app/steps/04-interfaces/README.md
+++ b/adev/src/content/tutorials/first-app/steps/04-interfaces/README.md
@@ -70,9 +70,9 @@ There are a few more lessons to complete before that happens.
 
 1. In `src/app/home/home.ts`, replace the empty `export class Home {}` definition with this code to create a single instance of the new interface in the component.
 
-    <docs-code header="Add sample data to src/app/home/home.ts" path="adev/src/content/tutorials/first-app/steps/05-inputs/src/app/home/home.ts" visibleLines="[23,36]"/>
+    <docs-code header="Add sample data to src/app/home/home.ts" path="adev/src/content/tutorials/first-app/steps/05-inputs/src/app/home/home.ts" visibleLines="[22,35]"/>
 
-1. Confirm that your `home.ts` file matches like this example.
+1. Confirm that your `home.ts` file matches this example.
 
     <docs-code header="src/app/home/home.ts" path="adev/src/content/tutorials/first-app/steps/05-inputs/src/app/home/home.ts" visibleLines="[1,36]" />
 
diff --git a/adev/src/content/tutorials/first-app/steps/07-dynamic-template-values/src/app/home/home.ts b/adev/src/content/tutorials/first-app/steps/07-dynamic-template-values/src/app/home/home.ts
index 54a16e327458..587728d024dd 100644
--- a/adev/src/content/tutorials/first-app/steps/07-dynamic-template-values/src/app/home/home.ts
+++ b/adev/src/content/tutorials/first-app/steps/07-dynamic-template-values/src/app/home/home.ts
@@ -1,6 +1,6 @@
 import {Component} from '@angular/core';
 import {CommonModule} from '@angular/common';
-import {HousingLocationInfo} from '../housing-location/housing-location';
+import {HousingLocation} from '../housing-location/housing-location';
 import {HousingLocationInfo} from '../housinglocation';
 
 @Component({
diff --git a/adev/src/content/tutorials/first-app/steps/09-services/src/app/home/home.ts b/adev/src/content/tutorials/first-app/steps/09-services/src/app/home/home.ts
index 79bed4f750b4..be3660f0f67f 100644
--- a/adev/src/content/tutorials/first-app/steps/09-services/src/app/home/home.ts
+++ b/adev/src/content/tutorials/first-app/steps/09-services/src/app/home/home.ts
@@ -1,6 +1,6 @@
 import {Component} from '@angular/core';
 import {CommonModule} from '@angular/common';
-import {HousingLocationInfo} from '../housing-location/housing-location';
+import {HousingLocation} from '../housing-location/housing-location';
 import {HousingLocationInfo} from '../housinglocation';
 
 @Component({
diff --git a/adev/src/content/tutorials/first-app/steps/10-routing/src/app/home/home.ts b/adev/src/content/tutorials/first-app/steps/10-routing/src/app/home/home.ts
index cd5a476b48a5..d75bb8884867 100644
--- a/adev/src/content/tutorials/first-app/steps/10-routing/src/app/home/home.ts
+++ b/adev/src/content/tutorials/first-app/steps/10-routing/src/app/home/home.ts
@@ -1,6 +1,6 @@
 import {Component, inject} from '@angular/core';
 import {CommonModule} from '@angular/common';
-import {HousingLocationInfo} from '../housing-location/housing-location';
+import {HousingLocation} from '../housing-location/housing-location';
 import {HousingLocationInfo} from '../housinglocation';
 import {HousingService} from '../housing.service';
 @Component({
diff --git a/adev/src/content/tutorials/first-app/steps/11-details-page/README.md b/adev/src/content/tutorials/first-app/steps/11-details-page/README.md
index 2b65717d6ae2..ba7d28f90db4 100644
--- a/adev/src/content/tutorials/first-app/steps/11-details-page/README.md
+++ b/adev/src/content/tutorials/first-app/steps/11-details-page/README.md
@@ -72,7 +72,7 @@ In this step, you will get the route parameter in the `Details`. Currently, the
 1. In the browser, click on one of the housing location's "Learn More" links and confirm that the numeric value displayed on the page matches the `id` property for that location in the data.
 </docs-step>
 
-<docs-step title="Customize the `Detail`">
+<docs-step title="Customize the `Details`">
 Now that routing is working properly in the application this is a great time to update the template of the `Details` to display the specific data represented by the housing location for the route parameter.
 
 To access the data you will add a call to the `HousingService`.
diff --git a/adev/src/content/tutorials/first-app/steps/11-details-page/src/app/home/home.ts b/adev/src/content/tutorials/first-app/steps/11-details-page/src/app/home/home.ts
index 4a04e91a7ccc..85d8a6b9595c 100644
--- a/adev/src/content/tutorials/first-app/steps/11-details-page/src/app/home/home.ts
+++ b/adev/src/content/tutorials/first-app/steps/11-details-page/src/app/home/home.ts
@@ -1,6 +1,6 @@
 import {Component, inject} from '@angular/core';
 import {CommonModule} from '@angular/common';
-import {HousingLocationInfo} from '../housing-location/housing-location';
+import {HousingLocation} from '../housing-location/housing-location';
 import {HousingLocationInfo} from '../housinglocation';
 import {HousingService} from '../housing.service';
 
diff --git a/adev/src/content/tutorials/first-app/steps/12-forms/README.md b/adev/src/content/tutorials/first-app/steps/12-forms/README.md
index 09ce9e001ed2..6ef7acf53c54 100644
--- a/adev/src/content/tutorials/first-app/steps/12-forms/README.md
+++ b/adev/src/content/tutorials/first-app/steps/12-forms/README.md
@@ -25,7 +25,7 @@ In the **Edit** pane of your IDE:
 
 1. In `src/app/housing.service.ts`, inside the `HousingService` class, paste this method at the bottom of the class definition.
 
-<docs-code header="Submit method in src/app/housing.service.ts" path="adev/src/content/tutorials/first-app/steps/13-search/src/app/housing.service.ts" visibleLines="[120,124]"/>
+    <docs-code header="Submit method in src/app/housing.service.ts" path="adev/src/content/tutorials/first-app/steps/13-search/src/app/housing.service.ts" visibleLines="[120,124]"/>
 
 1. Confirm that the app builds without error.
    Correct any errors before you continue to the next step.
@@ -38,21 +38,21 @@ In the **Edit** pane of your IDE, in `src/app/details/details.ts`:
 
 1. After the `import` statements at the top of the file, add the following code to import the Angular form classes.
 
-<docs-code header="Forms imports in src/app/details/details.ts" path="adev/src/content/tutorials/first-app/steps/13-search/src/app/details/details.ts" visibleLines="[6]"/>
+    <docs-code header="Forms imports in src/app/details/details.ts" path="adev/src/content/tutorials/first-app/steps/13-search/src/app/details/details.ts" visibleLines="[6]"/>
 
 1. In the `Details` decorator metadata, update the `imports` property with the following code:
 
-<docs-code header="imports directive in src/app/details/details.ts" path="adev/src/content/tutorials/first-app/steps/13-search/src/app/details/details.ts" visibleLines="[10]"/>
+    <docs-code header="imports directive in src/app/details/details.ts" path="adev/src/content/tutorials/first-app/steps/13-search/src/app/details/details.ts" visibleLines="[9]"/>
 
 1. In the `Details` class, before the `constructor()` method, add the following code to create the form object.
 
-   <docs-code header="template directive in src/app/details/details.ts" path="adev/src/content/tutorials/first-app/steps/13-search/src/app/details/details.ts" visibleLines="[53,57]"/>
+   <docs-code header="template directive in src/app/details/details.ts" path="adev/src/content/tutorials/first-app/steps/13-search/src/app/details/details.ts" visibleLines="[52,56]"/>
 
    In Angular, `FormGroup` and `FormControl` are types that enable you to build forms. The `FormControl` type can provide a default value and shape the form data. In this example `firstName` is a `string` and the default value is empty string.
 
 1. In the `Details` class, after the `constructor()` method, add the following code to handle the **Apply now** click.
 
-   <docs-code header="template directive in src/app/details/details.ts" path="adev/src/content/tutorials/first-app/steps/13-search/src/app/details/details.ts" visibleLines="[63,69]"/>
+   <docs-code header="template directive in src/app/details/details.ts" path="adev/src/content/tutorials/first-app/steps/13-search/src/app/details/details.ts" visibleLines="[62,68]"/>
 
    This button does not exist yet - you will add it in the next step. In the above code, the `FormControl`s may return `null`. This code uses the nullish coalescing operator to default to empty string if the value is `null`.
 
diff --git a/adev/src/content/tutorials/first-app/steps/12-forms/src/app/home/home.ts b/adev/src/content/tutorials/first-app/steps/12-forms/src/app/home/home.ts
index 4a04e91a7ccc..85d8a6b9595c 100644
--- a/adev/src/content/tutorials/first-app/steps/12-forms/src/app/home/home.ts
+++ b/adev/src/content/tutorials/first-app/steps/12-forms/src/app/home/home.ts
@@ -1,6 +1,6 @@
 import {Component, inject} from '@angular/core';
 import {CommonModule} from '@angular/common';
-import {HousingLocationInfo} from '../housing-location/housing-location';
+import {HousingLocation} from '../housing-location/housing-location';
 import {HousingLocationInfo} from '../housinglocation';
 import {HousingService} from '../housing.service';
 
diff --git a/adev/src/content/tutorials/first-app/steps/13-search/README.md b/adev/src/content/tutorials/first-app/steps/13-search/README.md
index 86f8e5795e49..3bd4aeeaa8a3 100644
--- a/adev/src/content/tutorials/first-app/steps/13-search/README.md
+++ b/adev/src/content/tutorials/first-app/steps/13-search/README.md
@@ -20,13 +20,13 @@ In this step, you'll update the `Home` class to store data in a new array proper
 
 1. In `src/app/home/home.ts`, add new property to the class called `filteredLocationList`.
 
-   <docs-code header="Add the filtered results property" path="adev/src/content/tutorials/first-app/steps/14-http/src/app/home/home.ts" visibleLines="[30]"/>
+   <docs-code header="Add the filtered results property" path="adev/src/content/tutorials/first-app/steps/14-http/src/app/home/home.ts" visibleLines="[29]"/>
 
    The `filteredLocationList` hold the values that match the search criteria entered by the user.
 
 1. The `filteredLocationList` should contain the total set of housing locations values by default when the page loads. Update the `constructor` for the `Home` to set the value.
 
-<docs-code header="Set the value of filteredLocationList" path="adev/src/content/tutorials/first-app/steps/14-http/src/app/home/home.ts" visibleLines="[31,34]"/>
+<docs-code header="Set the value of filteredLocationList" path="adev/src/content/tutorials/first-app/steps/14-http/src/app/home/home.ts" visibleLines="[30,33]"/>
 
 </docs-step>
 
@@ -62,7 +62,7 @@ The template has been updated to bind the `filterResults` function to the `click
 
 1. Update the `Home` class to include the implementation of the `filterResults` function.
 
-   <docs-code header="Add the filterResults function implementation" path="adev/src/content/tutorials/first-app/steps/14-http/src/app/home/home.ts" visibleLines="[35,44]"/>
+   <docs-code header="Add the filterResults function implementation" path="adev/src/content/tutorials/first-app/steps/14-http/src/app/home/home.ts" visibleLines="[34,43]"/>
 
    This function uses the `String` `filter` function to compare the value of the `text` parameter against the `housingLocation.city` property. You can update this function to match against any property or multiple properties for a fun exercise.
 
diff --git a/adev/src/content/tutorials/first-app/steps/13-search/src/app/home/home.ts b/adev/src/content/tutorials/first-app/steps/13-search/src/app/home/home.ts
index 4a04e91a7ccc..85d8a6b9595c 100644
--- a/adev/src/content/tutorials/first-app/steps/13-search/src/app/home/home.ts
+++ b/adev/src/content/tutorials/first-app/steps/13-search/src/app/home/home.ts
@@ -1,6 +1,6 @@
 import {Component, inject} from '@angular/core';
 import {CommonModule} from '@angular/common';
-import {HousingLocationInfo} from '../housing-location/housing-location';
+import {HousingLocation} from '../housing-location/housing-location';
 import {HousingLocationInfo} from '../housinglocation';
 import {HousingService} from '../housing.service';
 
diff --git a/adev/src/content/tutorials/first-app/steps/14-http/src-final/app/home/home.ts b/adev/src/content/tutorials/first-app/steps/14-http/src-final/app/home/home.ts
index 29663093c873..1ca48e11eeef 100644
--- a/adev/src/content/tutorials/first-app/steps/14-http/src-final/app/home/home.ts
+++ b/adev/src/content/tutorials/first-app/steps/14-http/src-final/app/home/home.ts
@@ -1,6 +1,6 @@
 import {Component, inject} from '@angular/core';
 import {CommonModule} from '@angular/common';
-import {HousingLocationInfo} from '../housing-location/housing-location';
+import {HousingLocation} from '../housing-location/housing-location';
 import {HousingLocationInfo} from '../housinglocation';
 import {HousingService} from '../housing.service';
 
diff --git a/adev/src/content/tutorials/first-app/steps/14-http/src/app/home/home.ts b/adev/src/content/tutorials/first-app/steps/14-http/src/app/home/home.ts
index aea67d72817d..a6720a1d2c19 100644
--- a/adev/src/content/tutorials/first-app/steps/14-http/src/app/home/home.ts
+++ b/adev/src/content/tutorials/first-app/steps/14-http/src/app/home/home.ts
@@ -1,6 +1,6 @@
 import {Component, inject} from '@angular/core';
 import {CommonModule} from '@angular/common';
-import {HousingLocationInfo} from '../housing-location/housing-location';
+import {HousingLocation} from '../housing-location/housing-location';
 import {HousingLocationInfo} from '../housinglocation';
 import {HousingService} from '../housing.service';
 
diff --git a/packages/common/http/BUILD.bazel b/packages/common/http/BUILD.bazel
index ce34fb8be081..7f17d67bdf44 100644
--- a/packages/common/http/BUILD.bazel
+++ b/packages/common/http/BUILD.bazel
@@ -15,7 +15,6 @@ ng_project(
     ),
     interop_deps = [
         "//packages/core",
-        "//packages/zone.js/lib:zone_d_ts",
     ],
     deps = [
         "//:node_modules/rxjs",
diff --git a/packages/core/test/BUILD.bazel b/packages/core/test/BUILD.bazel
index 11aa1376ef9b..daf0784a587b 100644
--- a/packages/core/test/BUILD.bazel
+++ b/packages/core/test/BUILD.bazel
@@ -68,7 +68,6 @@ ts_project(
         "//packages/private/testing",
         "//packages/router",
         "//packages/router/testing",
-        "//packages/zone.js/lib:zone_d_ts",
     ],
     # Visible to //:saucelabs_unit_tests_poc target
     visibility = ["//:__pkg__"],
@@ -112,7 +111,6 @@ jasmine_node_test(
         ":test_node_only_lib",
         "//packages/platform-server",
         "//packages/platform-server/testing",
-        "//packages/zone.js/lib:zone_d_ts",
         "@npm//source-map",
     ],
 )
diff --git a/packages/core/test/acceptance/BUILD.bazel b/packages/core/test/acceptance/BUILD.bazel
index aea3d6e05114..6a0d41711e28 100644
--- a/packages/core/test/acceptance/BUILD.bazel
+++ b/packages/core/test/acceptance/BUILD.bazel
@@ -35,7 +35,6 @@ ts_project(
         "//packages/platform-server",
         "//packages/private/testing",
         "//packages/router",
-        "//packages/zone.js/lib:zone_d_ts",
     ],
     # Visible to //:saucelabs_unit_tests
     visibility = ["//:__pkg__"],
@@ -66,7 +65,6 @@ jasmine_node_test(
     deps = [
         ":acceptance_lib",
         ":forward_ref_test_lib",
-        "//packages/zone.js/lib:zone_d_ts",
         "@npm//source-map",
     ],
 )
diff --git a/packages/core/test/acceptance/selectorless/BUILD b/packages/core/test/acceptance/selectorless/BUILD
index 5f1d302f3e63..e73401d3b729 100644
--- a/packages/core/test/acceptance/selectorless/BUILD
+++ b/packages/core/test/acceptance/selectorless/BUILD
@@ -11,7 +11,6 @@ ng_project(
     interop_deps = [
         "//packages/core",
         "//packages/core/testing",
-        "//packages/zone.js/lib:zone_d_ts",
     ],
     tsconfig = ":tsconfig.json",
     visibility = ["//:__pkg__"],
@@ -22,7 +21,6 @@ jasmine_node_test(
     bootstrap = ["//tools/testing:node"],
     deps = [
         ":selectorless_test_lib",
-        "//packages/zone.js/lib:zone_d_ts",
         "@npm//source-map",
     ],
 )
diff --git a/packages/core/test/render3/BUILD.bazel b/packages/core/test/render3/BUILD.bazel
index 80c5f548ec8b..7a158566e144 100644
--- a/packages/core/test/render3/BUILD.bazel
+++ b/packages/core/test/render3/BUILD.bazel
@@ -64,7 +64,6 @@ ts_project(
         "//packages/compiler",
         "//packages/platform-server",
         "//packages/platform-server:bundled_domino_lib",
-        "//packages/zone.js/lib:zone_d_ts",
     ],
 )
 
diff --git a/packages/core/testing/BUILD.bazel b/packages/core/testing/BUILD.bazel
index 536d83d9c8a5..e4677a1f7f81 100644
--- a/packages/core/testing/BUILD.bazel
+++ b/packages/core/testing/BUILD.bazel
@@ -13,7 +13,6 @@ ng_project(
         "//packages/core",
         "//packages/core/primitives/dom-navigation/testing",
         "//packages/localize",
-        "//packages/zone.js/lib:zone_d_ts",
     ],
     deps = [
         "//:node_modules/@types/jasmine",
diff --git a/packages/platform-browser/BUILD.bazel b/packages/platform-browser/BUILD.bazel
index fe9d4001decf..5a48e4ea8988 100644
--- a/packages/platform-browser/BUILD.bazel
+++ b/packages/platform-browser/BUILD.bazel
@@ -13,7 +13,6 @@ ng_project(
     ),
     interop_deps = [
         "//packages:types",
-        "//packages/zone.js/lib:zone_d_ts",
     ],
     deps = [
         "//:node_modules/@types/hammerjs",
diff --git a/packages/platform-server/BUILD.bazel b/packages/platform-server/BUILD.bazel
index 99a8980bcaff..b65810912d49 100644
--- a/packages/platform-server/BUILD.bazel
+++ b/packages/platform-server/BUILD.bazel
@@ -18,7 +18,6 @@ ng_project(
         "//packages/common/http",
         "//packages/compiler",
         "//packages/platform-browser",
-        "//packages/zone.js/lib:zone_d_ts",
         ":bundled_domino_lib",
     ],
     deps = [
diff --git a/packages/upgrade/BUILD.bazel b/packages/upgrade/BUILD.bazel
index e5399ae041ef..c04d78896401 100644
--- a/packages/upgrade/BUILD.bazel
+++ b/packages/upgrade/BUILD.bazel
@@ -14,7 +14,6 @@ ng_project(
     interop_deps = [
         "//packages/core",
         "//packages/platform-browser-dynamic",
-        "//packages/zone.js/lib:zone_d_ts",
     ],
     deps = [
         "//packages/upgrade/src/common:common_rjs",