diff --git a/packages/mosaic-dev/all/module.ts b/packages/mosaic-dev/all/module.ts
index 084893fb1..06a7cddb9 100644
--- a/packages/mosaic-dev/all/module.ts
+++ b/packages/mosaic-dev/all/module.ts
@@ -5,7 +5,7 @@ import { FormControl, FormsModule, ReactiveFormsModule, Validators } from '@angu
 import { BrowserModule } from '@angular/platform-browser';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { CdkTreeModule, FlatTreeControl, NestedTreeControl } from '@ptsecurity/cdk/tree';
+import { CdkTreeModule, FlatTreeControl } from '@ptsecurity/cdk/tree';
 import { McMomentDateModule } from '@ptsecurity/mosaic-moment-adapter/adapter';
 import { McButtonModule } from '@ptsecurity/mosaic/button';
 import { McButtonToggleModule } from '@ptsecurity/mosaic/button-toggle';
@@ -29,7 +29,7 @@ import { McTextareaModule } from '@ptsecurity/mosaic/textarea';
 import { McTimepickerModule } from '@ptsecurity/mosaic/timepicker';
 import { McToggleModule } from '@ptsecurity/mosaic/toggle';
 import { McToolTipModule } from '@ptsecurity/mosaic/tooltip';
-import { McTreeFlatDataSource, McTreeFlattener, McTreeModule, McTreeNestedDataSource } from '@ptsecurity/mosaic/tree';
+import { McTreeFlatDataSource, McTreeFlattener, McTreeModule } from '@ptsecurity/mosaic/tree';
 import { Observable, of as observableOf } from 'rxjs';
 
 import { FileDatabase, FileFlatNode, FileNode } from '../tree/module';
@@ -84,6 +84,7 @@ export class DemoComponent {
             updated: new Date('1/28/16')
         }
     ];
+
     notes = [
         {
             name: 'Vacation Itinerary',
@@ -128,9 +129,6 @@ export class DemoComponent {
     dataSource: McTreeFlatDataSource<FileNode, FileFlatNode>;
     treeFlattener: McTreeFlattener<FileNode, FileFlatNode>;
 
-    nestedTreeControl: NestedTreeControl<FileNode>;
-    nestedDataSource: McTreeNestedDataSource<FileNode>;
-
     constructor(private modalService: McModalService, database: FileDatabase) {
         setInterval(() => {
             this.percent = (this.percent + STEP) % (MAX_PERCENT + STEP);
@@ -143,12 +141,8 @@ export class DemoComponent {
         this.treeControl = new FlatTreeControl<FileFlatNode>(this._getLevel, this._isExpandable);
         this.dataSource = new McTreeFlatDataSource(this.treeControl, this.treeFlattener);
 
-        this.nestedTreeControl = new NestedTreeControl<FileNode>(this._getChildren);
-        this.nestedDataSource = new McTreeNestedDataSource();
-
         database.dataChange.subscribe((data) => {
             this.dataSource.data = data;
-            this.nestedDataSource.data = data;
         });
     }
 
diff --git a/packages/mosaic-dev/all/template.html b/packages/mosaic-dev/all/template.html
index 2a3566d46..689d83f08 100644
--- a/packages/mosaic-dev/all/template.html
+++ b/packages/mosaic-dev/all/template.html
@@ -1191,9 +1191,16 @@ <h1>Tree</h1>
             [dataSource]="dataSource"
             [treeControl]="treeControl">
 
-            <mc-tree-option *mcTreeNodeDef="let node" mcTreeNodePadding>{{ node.name }}</mc-tree-option>
+            <mc-tree-option
+                *mcTreeNodeDef="let node" mcTreeNodePadding
+                [value]="node.name">
+                {{ node.name }}
+            </mc-tree-option>
 
-            <mc-tree-option *mcTreeNodeDef="let node; when: hasChild" mcTreeNodePadding>
+            <mc-tree-option
+                *mcTreeNodeDef="let node; when: hasChild"
+                mcTreeNodePadding
+                [value]="node.name">
                 <i mc-icon="mc-angle-down-S_16" [style.transform]="treeControl.isExpanded(node) ? '' : 'rotate(-90deg)'" mcTreeNodeToggle></i>
                 {{ node.name }} : {{ node.type }}
             </mc-tree-option>