diff --git a/samples/MauiEmbedding/MauiEmbedding/App.xaml b/samples/MauiEmbedding/MauiEmbedding/App.xaml
index 04f7e98ce..e0f648bd2 100644
--- a/samples/MauiEmbedding/MauiEmbedding/App.xaml
+++ b/samples/MauiEmbedding/MauiEmbedding/App.xaml
@@ -14,6 +14,6 @@
       </ResourceDictionary.MergedDictionaries>
     </ResourceDictionary>
   </Application.Resources>
-  <!-- Add resources here -->
+  
 
 </Application>
diff --git a/samples/MauiEmbedding/MauiEmbedding/App.xaml.cs b/samples/MauiEmbedding/MauiEmbedding/App.xaml.cs
index c01b9d78f..944012f8d 100644
--- a/samples/MauiEmbedding/MauiEmbedding/App.xaml.cs
+++ b/samples/MauiEmbedding/MauiEmbedding/App.xaml.cs
@@ -74,8 +74,6 @@ public partial class App : Application
         MainWindow = builder.Window;
 
         Host = await builder.NavigateAsync<Shell>();
-
-        //MainWindow.Content = new MainPage();
     }
 
     private static void RegisterRoutes(IViewRegistry views, IRouteRegistry routes)
diff --git a/samples/MauiEmbedding/MauiEmbedding/AppResources.xaml b/samples/MauiEmbedding/MauiEmbedding/AppResources.xaml
deleted file mode 100644
index d063d9061..000000000
--- a/samples/MauiEmbedding/MauiEmbedding/AppResources.xaml
+++ /dev/null
@@ -1,14 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-	<ResourceDictionary.MergedDictionaries>
-		<!-- Load WinUI resources -->
-		<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
-		<MaterialToolkitTheme xmlns="using:Uno.Toolkit.UI.Material"
-			ColorOverrideSource="ms-appx:///MauiEmbedding/Styles/ColorPaletteOverride.xaml"
-			FontOverrideSource="ms-appx:///MauiEmbedding/Styles/MaterialFontsOverride.xaml" />
-
-	</ResourceDictionary.MergedDictionaries>
-	<!-- Add resources here -->
-
-</ResourceDictionary>
diff --git a/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj b/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj
index 0a66d8f26..30a6a2d8b 100644
--- a/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj
+++ b/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Uno.Sdk">
+<Project Sdk="Uno.Sdk">
 	<Import Project="..\..\..\src\tfms-ui-maui.props" />
 
   <PropertyGroup>
@@ -31,10 +31,8 @@
     -->
     <UnoFeatures>
       Material;
-      Dsp;
       Toolkit;
-      Mvvm;
-      ThemeService;
+			Mvvm;
     </UnoFeatures>
   </PropertyGroup>
 
diff --git a/samples/Playground/Playground/App.xaml b/samples/Playground/Playground/App.xaml
index 253133d54..0bcad93b3 100644
--- a/samples/Playground/Playground/App.xaml
+++ b/samples/Playground/Playground/App.xaml
@@ -35,6 +35,6 @@
     </ResourceDictionary>
   </Application.Resources>
 
-  <!-- Add resources here -->
+  
 
 </Application>
diff --git a/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests/App.xaml b/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests/App.xaml
index fc4bb364a..8fddabaf5 100644
--- a/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests/App.xaml
+++ b/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests/App.xaml
@@ -11,6 +11,6 @@
     </ResourceDictionary>
   </Application.Resources>
 
-  <!-- Add resources here -->
+  
 
 </Application>
diff --git a/testing/TestHarness/TestHarness/App.xaml b/testing/TestHarness/TestHarness/App.xaml
index c4bc09656..e57007070 100644
--- a/testing/TestHarness/TestHarness/App.xaml
+++ b/testing/TestHarness/TestHarness/App.xaml
@@ -12,8 +12,6 @@
 				<!-- Load Uno.UI.Toolkit resources -->
 				<ToolkitResources xmlns="using:Uno.Toolkit.UI" />
 
-				<!--<MaterialColors xmlns="using:Uno.Material"  />
-			<MaterialFonts xmlns="using:Uno.Material"  />-->
 				<MaterialResources xmlns="using:Uno.Material" />
 
 				<MaterialToolkitResources xmlns="using:Uno.Toolkit.UI.Material" />
@@ -23,7 +21,6 @@
 
 			</ResourceDictionary.MergedDictionaries>
 
-			<!-- Add resources here -->
 			<x:Double x:Key="WideMinWindowWidth">800</x:Double>
 
 			<Style TargetType="utu:LoadingView">
diff --git a/testing/TestHarness/TestHarness/TestHarness.csproj b/testing/TestHarness/TestHarness/TestHarness.csproj
index 57dc52f97..a8c13ae2e 100644
--- a/testing/TestHarness/TestHarness/TestHarness.csproj
+++ b/testing/TestHarness/TestHarness/TestHarness.csproj
@@ -35,6 +35,7 @@
 			Toolkit;
 			Mvvm;
     </UnoFeatures>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Debug' or '$(IsUiAutomationMappingEnabled)'=='True'">