diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-delete-prompt/album-delete-prompt.ts b/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-delete-prompt/album-delete-prompt.ts
index 4ec4ed7..88cdb22 100644
--- a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-delete-prompt/album-delete-prompt.ts
+++ b/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-delete-prompt/album-delete-prompt.ts
@@ -1,13 +1,11 @@
 import * as ng from 'angular2/core';
-import { NgIf } from 'angular2/common';
 import * as models from '../../../models/models';
 
 @ng.Component({
   selector: 'album-delete-prompt'
 })
 @ng.View({
-  templateUrl: './ng-app/components/admin/album-delete-prompt/album-delete-prompt.html',
-  directives: [NgIf]
+  templateUrl: './ng-app/components/admin/album-delete-prompt/album-delete-prompt.html'
 })
 export class AlbumDeletePrompt {
     public album: models.Album;
diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-details/album-details.ts b/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-details/album-details.ts
index 56a6b70..7b2228f 100644
--- a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-details/album-details.ts
+++ b/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-details/album-details.ts
@@ -2,7 +2,6 @@ import * as ng from 'angular2/core';
 import * as router from 'angular2/router';
 import * as models from '../../../models/models';
 import { Http, HTTP_BINDINGS } from 'angular2/http';
-import { NgIf } from 'angular2/common';
 import { AlbumDeletePrompt } from '../album-delete-prompt/album-delete-prompt';
 
 @ng.Component({
@@ -10,7 +9,7 @@ import { AlbumDeletePrompt } from '../album-delete-prompt/album-delete-prompt';
 })
 @ng.View({
   templateUrl: './ng-app/components/admin/album-details/album-details.html',
-  directives: [router.ROUTER_DIRECTIVES, NgIf, AlbumDeletePrompt]
+  directives: [router.ROUTER_DIRECTIVES, AlbumDeletePrompt]
 })
 export class AlbumDetails {
     public albumData: models.Album;
diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-edit/album-edit.ts b/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-edit/album-edit.ts
index 1b48765..0ff5fe5 100644
--- a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-edit/album-edit.ts
+++ b/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-edit/album-edit.ts
@@ -1,6 +1,6 @@
 import * as ng from 'angular2/core';
 import { Observable } from 'rxjs';
-import { Control, ControlGroup, FormBuilder, Validators, NgIf, NgFor, FORM_DIRECTIVES } from 'angular2/common';
+import { Control, ControlGroup, FormBuilder, Validators, FORM_DIRECTIVES } from 'angular2/common';
 import * as router from 'angular2/router';
 import * as models from '../../../models/models';
 import { Http, HTTP_BINDINGS, Headers, Response } from 'angular2/http';
@@ -13,7 +13,7 @@ import * as AspNet from 'angular2-aspnet';
 })
 @ng.View({
     templateUrl: './ng-app/components/admin/album-edit/album-edit.html',
-    directives: [router.ROUTER_DIRECTIVES, NgIf, NgFor, AlbumDeletePrompt, FormField, FORM_DIRECTIVES]
+    directives: [router.ROUTER_DIRECTIVES, AlbumDeletePrompt, FormField, FORM_DIRECTIVES]
 })
 export class AlbumEdit {
     public form: ControlGroup;
diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/albums-list/albums-list.ts b/samples/angular/MusicStore/wwwroot/ng-app/components/admin/albums-list/albums-list.ts
index 0ce8e5c..d725c31 100644
--- a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/albums-list/albums-list.ts
+++ b/samples/angular/MusicStore/wwwroot/ng-app/components/admin/albums-list/albums-list.ts
@@ -1,7 +1,6 @@
 import * as ng from 'angular2/core';
 import * as router from 'angular2/router';
 import { Http, HTTP_BINDINGS } from 'angular2/http';
-import { NgFor, NgClass } from 'angular2/common';
 import * as models from '../../../models/models';
 import { AlbumDeletePrompt } from '../album-delete-prompt/album-delete-prompt';
 
@@ -10,7 +9,7 @@ import { AlbumDeletePrompt } from '../album-delete-prompt/album-delete-prompt';
 })
 @ng.View({
   templateUrl: './ng-app/components/admin/albums-list/albums-list.html',
-  directives: [NgFor, NgClass, router.ROUTER_DIRECTIVES, AlbumDeletePrompt]
+  directives: [router.ROUTER_DIRECTIVES, AlbumDeletePrompt]
 })
 export class AlbumsList {
     public rows: models.Album[];
diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/form-field/form-field.ts b/samples/angular/MusicStore/wwwroot/ng-app/components/admin/form-field/form-field.ts
index 1ad4dcc..ec42f8d 100644
--- a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/form-field/form-field.ts
+++ b/samples/angular/MusicStore/wwwroot/ng-app/components/admin/form-field/form-field.ts
@@ -1,13 +1,12 @@
 import * as ng from 'angular2/core';
-import { NgIf, NgFor, AbstractControl } from 'angular2/common';
+import { AbstractControl } from 'angular2/common';
 
 @ng.Component({
   selector: 'form-field',
   properties: ['label', 'validate']
 })
 @ng.View({
-  templateUrl: './ng-app/components/admin/form-field/form-field.html',
-  directives: [NgIf, NgFor]
+  templateUrl: './ng-app/components/admin/form-field/form-field.html'
 })
 export class FormField {
     public errorMessages: string[] = [];
diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/app/app.ts b/samples/angular/MusicStore/wwwroot/ng-app/components/app/app.ts
index 645aa51..50fb093 100644
--- a/samples/angular/MusicStore/wwwroot/ng-app/components/app/app.ts
+++ b/samples/angular/MusicStore/wwwroot/ng-app/components/app/app.ts
@@ -1,7 +1,6 @@
 import * as ng from 'angular2/core';
 import * as router from 'angular2/router';
 import { Http, HTTP_BINDINGS } from 'angular2/http';
-import { NgFor } from 'angular2/common';
 import { Home } from '../public/home/home';
 import { AlbumDetails } from '../public/album-details/album-details';
 import { GenreContents } from '../public/genre-contents/genre-contents';
@@ -22,7 +21,7 @@ import * as models from '../../models/models';
 @ng.View({
     templateUrl: './ng-app/components/app/app.html',
     styleUrls: ['./ng-app/components/app/app.css'],
-    directives: [router.ROUTER_DIRECTIVES, NgFor]
+    directives: [router.ROUTER_DIRECTIVES]
 })
 export class App {
     public genres: models.Genre[];
diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/public/album-details/album-details.ts b/samples/angular/MusicStore/wwwroot/ng-app/components/public/album-details/album-details.ts
index 9d91b09..28af1e2 100644
--- a/samples/angular/MusicStore/wwwroot/ng-app/components/public/album-details/album-details.ts
+++ b/samples/angular/MusicStore/wwwroot/ng-app/components/public/album-details/album-details.ts
@@ -1,6 +1,5 @@
 import * as ng from 'angular2/core';
 import * as router from 'angular2/router';
-import { NgIf } from 'angular2/common';
 import { Http } from 'angular2/http';
 import * as models from '../../../models/models';
 
@@ -8,8 +7,7 @@ import * as models from '../../../models/models';
   selector: 'album-details'
 })
 @ng.View({
-  templateUrl: './ng-app/components/public/album-details/album-details.html',
-  directives: [NgIf]
+  templateUrl: './ng-app/components/public/album-details/album-details.html'
 })
 export class AlbumDetails {
     public albumData: models.Album;
diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/public/genre-contents/genre-contents.ts b/samples/angular/MusicStore/wwwroot/ng-app/components/public/genre-contents/genre-contents.ts
index e2b2d0e..dea5553 100644
--- a/samples/angular/MusicStore/wwwroot/ng-app/components/public/genre-contents/genre-contents.ts
+++ b/samples/angular/MusicStore/wwwroot/ng-app/components/public/genre-contents/genre-contents.ts
@@ -1,6 +1,5 @@
 import * as ng from 'angular2/core';
 import * as router from 'angular2/router';
-import { NgFor } from 'angular2/common';
 import { Http } from 'angular2/http';
 import * as models from '../../../models/models';
 import { AlbumTile } from '../album-tile/album-tile';
@@ -10,7 +9,7 @@ import { AlbumTile } from '../album-tile/album-tile';
 })
 @ng.View({
   templateUrl: './ng-app/components/public/genre-contents/genre-contents.html',
-  directives: [NgFor, AlbumTile]
+  directives: [AlbumTile]
 })
 export class GenreContents {
     public albums: models.Album[];
diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/public/genres-list/genres-list.ts b/samples/angular/MusicStore/wwwroot/ng-app/components/public/genres-list/genres-list.ts
index 5457da5..6fbdf80 100644
--- a/samples/angular/MusicStore/wwwroot/ng-app/components/public/genres-list/genres-list.ts
+++ b/samples/angular/MusicStore/wwwroot/ng-app/components/public/genres-list/genres-list.ts
@@ -1,6 +1,5 @@
 import * as ng from 'angular2/core';
 import * as router from 'angular2/router';
-import { NgIf, NgFor } from 'angular2/common';
 import { Http } from 'angular2/http';
 import * as models from '../../../models/models';
 
@@ -9,7 +8,7 @@ import * as models from '../../../models/models';
 })
 @ng.View({
   templateUrl: './ng-app/components/public/genres-list/genres-list.html',
-  directives: [router.ROUTER_DIRECTIVES, NgIf, NgFor]
+  directives: [router.ROUTER_DIRECTIVES]
 })
 export class GenresList {
     public genres: models.Genre[];
diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/public/home/home.ts b/samples/angular/MusicStore/wwwroot/ng-app/components/public/home/home.ts
index 7625485..ddb7917 100644
--- a/samples/angular/MusicStore/wwwroot/ng-app/components/public/home/home.ts
+++ b/samples/angular/MusicStore/wwwroot/ng-app/components/public/home/home.ts
@@ -1,6 +1,5 @@
 import * as ng from 'angular2/core';
 import { Http } from 'angular2/http';
-import { NgFor } from 'angular2/common';
 import { AlbumTile } from '../album-tile/album-tile';
 import * as models from '../../../models/models';
  
@@ -9,7 +8,7 @@ import * as models from '../../../models/models';
 })
 @ng.View({
   templateUrl: './ng-app/components/public/home/home.html',
-  directives: [NgFor, AlbumTile]
+  directives: [AlbumTile]
 })
 export class Home {
     public mostPopular: models.Album[];