diff --git a/samples/charts/toolbar/custom-tool/App.razor b/samples/charts/toolbar/custom-tool/App.razor
index 59609301d1..3e92decce8 100644
--- a/samples/charts/toolbar/custom-tool/App.razor
+++ b/samples/charts/toolbar/custom-tool/App.razor
@@ -1,3 +1,4 @@
+@using IgniteUI.Blazor.Controls
@using IgniteUI.Blazor.Controls;
@using System;
diff --git a/samples/charts/toolbar/custom-tool/CountryRenewableElectricity.cs b/samples/charts/toolbar/custom-tool/CountryRenewableElectricity.cs
deleted file mode 100644
index f7ec6c6174..0000000000
--- a/samples/charts/toolbar/custom-tool/CountryRenewableElectricity.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using System;
-using System.Collections.Generic;
-public class CountryRenewableElectricityItem
-{
- public string Year { get; set; }
- public double Europe { get; set; }
- public double China { get; set; }
- public double America { get; set; }
-}
-
-public class CountryRenewableElectricity
- : List
-{
- public CountryRenewableElectricity()
- {
- this.Add(new CountryRenewableElectricityItem()
- {
- Year = @"2009",
- Europe = 34,
- China = 21,
- America = 19
- });
- this.Add(new CountryRenewableElectricityItem()
- {
- Year = @"2010",
- Europe = 43,
- China = 26,
- America = 24
- });
- this.Add(new CountryRenewableElectricityItem()
- {
- Year = @"2011",
- Europe = 66,
- China = 29,
- America = 28
- });
- this.Add(new CountryRenewableElectricityItem()
- {
- Year = @"2012",
- Europe = 69,
- China = 32,
- America = 26
- });
- this.Add(new CountryRenewableElectricityItem()
- {
- Year = @"2013",
- Europe = 58,
- China = 47,
- America = 38
- });
- this.Add(new CountryRenewableElectricityItem()
- {
- Year = @"2014",
- Europe = 40,
- China = 46,
- America = 31
- });
- this.Add(new CountryRenewableElectricityItem()
- {
- Year = @"2015",
- Europe = 78,
- China = 50,
- America = 19
- });
- this.Add(new CountryRenewableElectricityItem()
- {
- Year = @"2016",
- Europe = 13,
- China = 90,
- America = 52
- });
- this.Add(new CountryRenewableElectricityItem()
- {
- Year = @"2017",
- Europe = 78,
- China = 132,
- America = 50
- });
- this.Add(new CountryRenewableElectricityItem()
- {
- Year = @"2018",
- Europe = 40,
- China = 134,
- America = 34
- });
- this.Add(new CountryRenewableElectricityItem()
- {
- Year = @"2018",
- Europe = 40,
- China = 134,
- America = 34
- });
- this.Add(new CountryRenewableElectricityItem()
- {
- Year = @"2019",
- Europe = 80,
- China = 96,
- America = 38
- });
- }
-}
diff --git a/samples/charts/toolbar/layout-actions-for-data-chart/App.razor b/samples/charts/toolbar/layout-actions-for-data-chart/App.razor
index 2ab7a1e4d1..bdf1fa835d 100644
--- a/samples/charts/toolbar/layout-actions-for-data-chart/App.razor
+++ b/samples/charts/toolbar/layout-actions-for-data-chart/App.razor
@@ -1,3 +1,4 @@
+@using IgniteUI.Blazor.Controls
@using IgniteUI.Blazor.Controls;
@using System;
diff --git a/samples/charts/toolbar/layout-in-vertical-orientation/App.razor b/samples/charts/toolbar/layout-in-vertical-orientation/App.razor
index 3b4e41c9cd..18c518ee81 100644
--- a/samples/charts/toolbar/layout-in-vertical-orientation/App.razor
+++ b/samples/charts/toolbar/layout-in-vertical-orientation/App.razor
@@ -1,4 +1,4 @@
-
+@using IgniteUI.Blazor.Controls
diff --git a/samples/charts/toolbar/theming/App.razor b/samples/charts/toolbar/theming/App.razor
index 08fc163fb6..80551acd46 100644
--- a/samples/charts/toolbar/theming/App.razor
+++ b/samples/charts/toolbar/theming/App.razor
@@ -1,4 +1,4 @@
-
+@using IgniteUI.Blazor.Controls
diff --git a/samples/charts/tree-map/layout/App.razor b/samples/charts/tree-map/layout/App.razor
index fa5a9b804d..1a9b4efef8 100644
--- a/samples/charts/tree-map/layout/App.razor
+++ b/samples/charts/tree-map/layout/App.razor
@@ -1,4 +1,4 @@
-
+@using IgniteUI.Blazor.Controls
diff --git a/samples/charts/tree-map/overview/App.razor b/samples/charts/tree-map/overview/App.razor
index b504c14e08..1a886d8e0e 100644
--- a/samples/charts/tree-map/overview/App.razor
+++ b/samples/charts/tree-map/overview/App.razor
@@ -1,4 +1,4 @@
-
+@using IgniteUI.Blazor.Controls
diff --git a/samples/charts/tree-map/styling/App.razor b/samples/charts/tree-map/styling/App.razor
index ccf233310c..cfc4cd3e83 100644
--- a/samples/charts/tree-map/styling/App.razor
+++ b/samples/charts/tree-map/styling/App.razor
@@ -1,4 +1,4 @@
-
+@using IgniteUI.Blazor.Controls
diff --git a/samples/grids/grid/action-strip/App.razor b/samples/grids/grid/action-strip/App.razor
index 9bf7f1ac40..3930a069c3 100644
--- a/samples/grids/grid/action-strip/App.razor
+++ b/samples/grids/grid/action-strip/App.razor
@@ -1,4 +1,4 @@
-
+@using IgniteUI.Blazor.Controls
diff --git a/samples/grids/grid/advanced-filtering-options/App.razor b/samples/grids/grid/advanced-filtering-options/App.razor
index e4b1b508db..6b8d10e5fc 100644
--- a/samples/grids/grid/advanced-filtering-options/App.razor
+++ b/samples/grids/grid/advanced-filtering-options/App.razor
@@ -1,3 +1,4 @@
+@using IgniteUI.Blazor.Controls
@inject IJSRuntime JS
diff --git a/samples/grids/grid/advanced-filtering-style/App.razor b/samples/grids/grid/advanced-filtering-style/App.razor
index 4258134796..8f45167856 100644
--- a/samples/grids/grid/advanced-filtering-style/App.razor
+++ b/samples/grids/grid/advanced-filtering-style/App.razor
@@ -1,3 +1,4 @@
+@using IgniteUI.Blazor.Controls
@inject IJSRuntime JS
diff --git a/samples/grids/grid/binding-composite-data/App.razor b/samples/grids/grid/binding-composite-data/App.razor
index bdaf2dd2f4..b3cab4caf6 100644
--- a/samples/grids/grid/binding-composite-data/App.razor
+++ b/samples/grids/grid/binding-composite-data/App.razor
@@ -1,3 +1,4 @@
+@using IgniteUI.Blazor.Controls
@inject IJSRuntime JS
diff --git a/samples/grids/grid/binding-crud-data/App.razor b/samples/grids/grid/binding-crud-data/App.razor
index dd5251de98..2b8b055275 100644
--- a/samples/grids/grid/binding-crud-data/App.razor
+++ b/samples/grids/grid/binding-crud-data/App.razor
@@ -1,4 +1,4 @@
-
+@using IgniteUI.Blazor.Controls
diff --git a/samples/grids/grid/binding-nested-data-1/App.razor b/samples/grids/grid/binding-nested-data-1/App.razor
index 8ff9cfc620..069e447eb1 100644
--- a/samples/grids/grid/binding-nested-data-1/App.razor
+++ b/samples/grids/grid/binding-nested-data-1/App.razor
@@ -1,3 +1,4 @@
+@using IgniteUI.Blazor.Controls
@inject IJSRuntime JS
diff --git a/samples/grids/grid/cascading-combo/App.razor b/samples/grids/grid/cascading-combo/App.razor
index f7f08aed4a..3438190d18 100644
--- a/samples/grids/grid/cascading-combo/App.razor
+++ b/samples/grids/grid/cascading-combo/App.razor
@@ -1,3 +1,4 @@
+@using IgniteUI.Blazor.Controls
@inject IJSRuntime JS
diff --git a/samples/grids/grid/cell-editing-sample/App.razor b/samples/grids/grid/cell-editing-sample/App.razor
index e94e2894dd..bd1354f098 100644
--- a/samples/grids/grid/cell-editing-sample/App.razor
+++ b/samples/grids/grid/cell-editing-sample/App.razor
@@ -1,3 +1,4 @@
+@using IgniteUI.Blazor.Controls
@inject IJSRuntime JS
diff --git a/samples/grids/grid/cell-editing-styling/App.razor b/samples/grids/grid/cell-editing-styling/App.razor
index 67668a6e95..856f3b42c3 100644
--- a/samples/grids/grid/cell-editing-styling/App.razor
+++ b/samples/grids/grid/cell-editing-styling/App.razor
@@ -1,4 +1,4 @@
-
+@using IgniteUI.Blazor.Controls