diff --git a/examples/Demo/Client/FluentUI.Demo.Client.csproj b/examples/Demo/Client/FluentUI.Demo.Client.csproj
index 47eb131c1b..d378ac8e5c 100644
--- a/examples/Demo/Client/FluentUI.Demo.Client.csproj
+++ b/examples/Demo/Client/FluentUI.Demo.Client.csproj
@@ -12,6 +12,13 @@
 		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" PrivateAssets="all" />
 	</ItemGroup>
 
+	<!-- For WASM, Trim Icons and Emojis Libs, -->
+	<!-- but not Core and Shared libs -->
+	<ItemGroup>
+		<TrimmerRootAssembly Include="Microsoft.FluentUI.AspNetCore.Components" />
+		<TrimmerRootAssembly Include="FluentUI.Demo.Shared" />
+	</ItemGroup>
+	
 	<ItemGroup>
 		<ProjectReference Include="..\Shared\FluentUI.Demo.Shared.csproj" />
 	</ItemGroup>
diff --git a/examples/Demo/Shared/Pages/Drag/DragDropPage.razor b/examples/Demo/Shared/Pages/Drag/DragDropPage.razor
index e30d1c1d9f..ed6d793b1b 100644
--- a/examples/Demo/Shared/Pages/Drag/DragDropPage.razor
+++ b/examples/Demo/Shared/Pages/Drag/DragDropPage.razor
@@ -20,14 +20,4 @@
 
 <ApiDocumentation Component="typeof(FluentDragContainer<>)" InstanceTypes="@(new[] {typeof(object)})" GenericLabel="TItem" />
 <ApiDocumentation Component="typeof(FluentDropZone<>)" InstanceTypes="@(new[] {typeof(object)})" GenericLabel="TItem" />
-<ApiDocumentation Component="typeof(FluentDragEventArgs<>)" InstanceTypes="@(new[] {typeof(object)})" GenericLabel="TItem" />
-
-@code
-{
-    // Hack to force the compiler to include this class in the final library
-    // (WASM publishing)
-    // TODO: To find a better solution
-    FluentDragContainer<object> temp1 = new FluentDragContainer<object>();
-    FluentDropZone<object> temp2 = new FluentDropZone<object>();
-    FluentDragEventArgs<object> temp3 = new FluentDragEventArgs<object>();
-}
\ No newline at end of file
+<ApiDocumentation Component="typeof(FluentDragEventArgs<>)" InstanceTypes="@(new[] {typeof(object)})" GenericLabel="TItem" />
\ No newline at end of file
diff --git a/examples/Demo/Shared/Pages/Emoji/EmojiPage.razor b/examples/Demo/Shared/Pages/Emoji/EmojiPage.razor
index 2c36d3459c..7b9aa56db3 100644
--- a/examples/Demo/Shared/Pages/Emoji/EmojiPage.razor
+++ b/examples/Demo/Shared/Pages/Emoji/EmojiPage.razor
@@ -41,12 +41,4 @@
 
 <h2 id="documentation">Documentation</h2>
 
-<ApiDocumentation Component="typeof(FluentEmoji<>)" InstanceTypes="@(new[] {typeof(Emoji)})" GenericLabel="Emoji"></ApiDocumentation>
-
-@code
-{
-    // Hack to force the compiler to include this class in the final library
-    // (WASM publishing)
-    // TODO: To find a better solution
-    FluentEmoji<Emoji> temp = new FluentEmoji<Emoji>();
-}
\ No newline at end of file
+<ApiDocumentation Component="typeof(FluentEmoji<>)" InstanceTypes="@(new[] {typeof(Emoji)})" GenericLabel="Emoji"></ApiDocumentation>
\ No newline at end of file
diff --git a/examples/Demo/Shared/Pages/MessageBar/Examples/MessageBarTimed.razor b/examples/Demo/Shared/Pages/MessageBar/Examples/MessageBarTimed.razor
index bdff66b1a3..4698f8daa8 100644
--- a/examples/Demo/Shared/Pages/MessageBar/Examples/MessageBarTimed.razor
+++ b/examples/Demo/Shared/Pages/MessageBar/Examples/MessageBarTimed.razor
@@ -36,7 +36,7 @@
             options.Title = message;
             options.Intent = type;
             options.Section = App.MESSAGES_TOP;
-            options.Timeout = 4;
+            options.Timeout = 4000;
         });
     }
 
diff --git a/examples/Demo/Shared/Pages/MessageBar/MessageBarPage.razor b/examples/Demo/Shared/Pages/MessageBar/MessageBarPage.razor
index 58aa81ab6f..0775a07bf1 100644
--- a/examples/Demo/Shared/Pages/MessageBar/MessageBarPage.razor
+++ b/examples/Demo/Shared/Pages/MessageBar/MessageBarPage.razor
@@ -89,15 +89,4 @@
 
 <ApiDocumentation Component="typeof(MessageService)" />
 
-<ApiDocumentation Component="typeof(Message)" />
-
-@code
-{
-    // Hack to force the compiler to include this class in the final library
-    // (WASM publishing)
-    // TODO: To find a better solution
-    FluentMessageBarProvider temp1 = new FluentMessageBarProvider();
-    FluentMessageBar temp2 = new FluentMessageBar();
-    MessageService temp3 = new MessageService();
-    Message temp4 = new Message();
-}
\ No newline at end of file
+<ApiDocumentation Component="typeof(Message)" />
\ No newline at end of file
diff --git a/examples/Demo/Shared/Pages/MessageBox/MessageBoxPage.razor b/examples/Demo/Shared/Pages/MessageBox/MessageBoxPage.razor
index c579095b0c..753442250d 100644
--- a/examples/Demo/Shared/Pages/MessageBox/MessageBoxPage.razor
+++ b/examples/Demo/Shared/Pages/MessageBox/MessageBoxPage.razor
@@ -47,23 +47,4 @@
 
 <ApiDocumentation Component="typeof(MessageBoxContent)" />
 
-<ApiDocumentation Component="typeof(DialogParameters<>)" InstanceTypes="@(new[] {typeof(MessageBoxContent)})" GenericLabel="MessageBoxData" />
-
-@code
-{
-    // Hack to force the compiler to include this class in the final library
-    // (WASM publishing)
-    // TODO: To find a better solution
-    protected override void OnInitialized()
-    {
-        var temp1 = new DialogParameters<MessageBoxContent>();
-        var temp2 = new MessageBoxContent()
-            {
-                Icon = new Icons.Regular.Size24.Check(),
-                IconColor = Color.Accent,
-            };
-        var temp3 = temp2.IconColor;
-        var temp4 = temp2.Intent;
-        var temp5 = temp2.MarkupMessage;
-    }    
-}
\ No newline at end of file
+<ApiDocumentation Component="typeof(DialogParameters<>)" InstanceTypes="@(new[] {typeof(MessageBoxContent)})" GenericLabel="MessageBoxData" />
\ No newline at end of file
diff --git a/examples/Demo/Shared/Pages/SplashScreen/SplashScreenPage.razor b/examples/Demo/Shared/Pages/SplashScreen/SplashScreenPage.razor
index a99e23eae5..fab4cc90a2 100644
--- a/examples/Demo/Shared/Pages/SplashScreen/SplashScreenPage.razor
+++ b/examples/Demo/Shared/Pages/SplashScreen/SplashScreenPage.razor
@@ -40,13 +40,4 @@
 
 <ApiDocumentation Component="typeof(SplashScreenContent)" />
 
-<ApiDocumentation Component="typeof(FluentSplashScreen)" />
-
-@code
-{
-    // Hack to force the compiler to include this class in the final library
-    // (WASM publishing)
-    // TODO: To find a better solution
-    SplashScreenContent temp1 = new SplashScreenContent();
-    FluentSplashScreen temp2 = new FluentSplashScreen() { Dialog = new FluentDialog() };
-}
\ No newline at end of file
+<ApiDocumentation Component="typeof(FluentSplashScreen)" />
\ No newline at end of file
diff --git a/examples/Demo/Shared/Pages/Splitter/SplitterPage.razor b/examples/Demo/Shared/Pages/Splitter/SplitterPage.razor
index b7f88cb87f..2e562dce4e 100644
--- a/examples/Demo/Shared/Pages/Splitter/SplitterPage.razor
+++ b/examples/Demo/Shared/Pages/Splitter/SplitterPage.razor
@@ -45,12 +45,3 @@
 
 <ApiDocumentation Component="typeof(FluentSplitter)" />
 <ApiDocumentation Component="typeof(SplitterResizedEventArgs)" />
-
-@code
-{
-    // Hack to force the compiler to include this class in the final library
-    // (WASM publishing)
-    // TODO: To find a better solution
-    FluentSplitter temp1 = new FluentSplitter();
-    SplitterResizedEventArgs temp2 = new SplitterResizedEventArgs();
-}
\ No newline at end of file