diff --git a/MADE.Samples.Android/AndroidLocator.cs b/MADE.Samples.Android/AndroidLocator.cs
index 36c7dd85..ecc325fa 100644
--- a/MADE.Samples.Android/AndroidLocator.cs
+++ b/MADE.Samples.Android/AndroidLocator.cs
@@ -7,8 +7,6 @@
     using MADE.App.Views.Dialogs;
     using MADE.App.Views.Threading;
 
-    using XPlat.UI.Core;
-
     public class AndroidLocator
     {
         static AndroidLocator()
diff --git a/MADE.Samples.Android/MADE.Samples.Android.csproj b/MADE.Samples.Android/MADE.Samples.Android.csproj
index 1bef61ca..645ea864 100644
--- a/MADE.Samples.Android/MADE.Samples.Android.csproj
+++ b/MADE.Samples.Android/MADE.Samples.Android.csproj
@@ -126,6 +126,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="MvvmLightLibsStd10">
+      <Version>5.4.1.1</Version>
+    </PackageReference>
     <PackageReference Include="Xamarin.Android.Support.Constraint.Layout">
       <Version>1.1.2</Version>
     </PackageReference>
diff --git a/MADE.Samples.Windows/MADE.Samples.Windows.csproj b/MADE.Samples.Windows/MADE.Samples.Windows.csproj
index 226abdc4..c78157c2 100644
--- a/MADE.Samples.Windows/MADE.Samples.Windows.csproj
+++ b/MADE.Samples.Windows/MADE.Samples.Windows.csproj
@@ -138,6 +138,9 @@
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.1.9</Version>
     </PackageReference>
+    <PackageReference Include="MvvmLightLibsStd10">
+      <Version>5.4.1.1</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MADE.App.Design\MADE.App.Design.csproj">
diff --git a/MADE.Samples.Windows/WindowsLocator.cs b/MADE.Samples.Windows/WindowsLocator.cs
index 8294161a..5df63972 100644
--- a/MADE.Samples.Windows/WindowsLocator.cs
+++ b/MADE.Samples.Windows/WindowsLocator.cs
@@ -1,7 +1,5 @@
 namespace MADE.Samples.Windows
 {
-    using CommonServiceLocator;
-
     using GalaSoft.MvvmLight.Ioc;
 
     using MADE.App.Diagnostics;
@@ -13,14 +11,9 @@ public class WindowsLocator
     {
         static WindowsLocator()
         {
-            if (!ServiceLocator.IsLocationProviderSet)
-            {
-                ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default);
-            }
-
             SimpleIoc.Default.Register<IEventLogger, EventLogger>();
             SimpleIoc.Default.Register<IAppDiagnostics>(
-                () => new AppDiagnostics(ServiceLocator.Current.GetInstance<IEventLogger>()));
+                () => new AppDiagnostics(SimpleIoc.Default.GetInstance<IEventLogger>()));
             SimpleIoc.Default.Register<IUIDispatcher, UIDispatcher>();
             SimpleIoc.Default.Register<IAppDialog, AppDialog>();
         }