diff --git a/Sample/Nuget/Sample.Android/MainActivity.cs b/Sample/Nuget/Sample.Android/MainActivity.cs
index 34f01f8..a9f8159 100644
--- a/Sample/Nuget/Sample.Android/MainActivity.cs
+++ b/Sample/Nuget/Sample.Android/MainActivity.cs
@@ -1,10 +1,5 @@
-using System;
-
-using Android.App;
+using Android.App;
 using Android.Content.PM;
-using Android.Runtime;
-using Android.Views;
-using Android.Widget;
 using Android.OS;
 
 namespace Sample.Droid
@@ -18,8 +13,8 @@ protected override void OnCreate(Bundle savedInstanceState)
             ToolbarResource = Resource.Layout.Toolbar;
 
             base.OnCreate(savedInstanceState);
-            global::Xamarin.Forms.Forms.Init(this, savedInstanceState);        
-            Xamarin.EnableKeyboardEffect.Droid.Effects.Init(this);
+            global::Xamarin.Forms.Forms.Init(this, savedInstanceState);
+            Xamarin.EnableKeyboardEffect.Platform.Droid.Effects.Init(this);
             LoadApplication(new App());
         }
     }
diff --git a/Sample/Nuget/Sample.Android/Sample.Android.csproj b/Sample/Nuget/Sample.Android/Sample.Android.csproj
index 0653516..0f21464 100644
--- a/Sample/Nuget/Sample.Android/Sample.Android.csproj
+++ b/Sample/Nuget/Sample.Android/Sample.Android.csproj
@@ -50,9 +50,9 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Xamarin.EnableKeyboardEffect">
-      <Version>1.0.5</Version>
+      <Version>1.0.6</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Forms" Version="3.4.0.1029999" />
+    <PackageReference Include="Xamarin.Forms" Version="3.0.0.446417" />
     <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.1" />
     <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.1" />
     <PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.1" />
diff --git a/Sample/Nuget/Sample.iOS/AppDelegate.cs b/Sample/Nuget/Sample.iOS/AppDelegate.cs
index 4c6e813..b8648c0 100644
--- a/Sample/Nuget/Sample.iOS/AppDelegate.cs
+++ b/Sample/Nuget/Sample.iOS/AppDelegate.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-using Foundation;
+using Foundation;
 using UIKit;
 
 namespace Sample.iOS
@@ -23,7 +19,7 @@ public partial class AppDelegate : global::Xamarin.Forms.Platform.iOS.FormsAppli
         public override bool FinishedLaunching(UIApplication app, NSDictionary options)
         {
             global::Xamarin.Forms.Forms.Init();
-            Xamarin.EnableKeyboardEffect.iOS.Effects.Init();
+            Xamarin.EnableKeyboardEffect.Platform.iOS.Effects.Init();
             LoadApplication(new App());
 
             return base.FinishedLaunching(app, options);
diff --git a/Sample/Nuget/Sample.iOS/Sample.iOS.csproj b/Sample/Nuget/Sample.iOS/Sample.iOS.csproj
index 77d70b2..9bca1e6 100644
--- a/Sample/Nuget/Sample.iOS/Sample.iOS.csproj
+++ b/Sample/Nuget/Sample.iOS/Sample.iOS.csproj
@@ -152,9 +152,9 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Xamarin.EnableKeyboardEffect">
-      <Version>1.0.5</Version>
+      <Version>1.0.6</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Forms" Version="3.4.0.1029999" />
+    <PackageReference Include="Xamarin.Forms" Version="3.0.0.446417" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Sample\Sample.csproj">
diff --git a/Sample/Nuget/Sample/MainPage.xaml b/Sample/Nuget/Sample/MainPage.xaml
index 2a2fcb2..1187896 100644
--- a/Sample/Nuget/Sample/MainPage.xaml
+++ b/Sample/Nuget/Sample/MainPage.xaml
@@ -7,32 +7,12 @@
     <StackLayout VerticalOptions="CenterAndExpand" HorizontalOptions="FillAndExpand">
         <Button Clicked="button1_clicked" Text="Focus Button 1"></Button>
         <Button Clicked="button2_clicked" Text="Focus Button 2"></Button>
-        <Entry x:Name="Entry1" Text="Hide Keyboard" effects:EnableKeyboardEffect.EnableKeyboard="False" Completed="Entry1_OnCompleted">
+        <Entry x:Name="Entry1" Text="Hide Keyboard" effects:EnableKeyboardEffect.EnableKeyboard="False">
             <Entry.Effects>
                 <effects:KeyboardEnableEffect/>
             </Entry.Effects>
         </Entry>
-        <Entry x:Name="Entry2" Text="Show Keyboard" effects:EnableKeyboardEffect.EnableKeyboard="True" Completed="Entry2_OnCompleted">
-                <Entry.Effects>
-                <effects:KeyboardEnableEffect/>
-            </Entry.Effects>
-        </Entry>
-        <Entry x:Name="Entry3" Text="Hide Keyboard" effects:EnableKeyboardEffect.EnableKeyboard="False" Completed="Entry3_OnCompleted">
-            <Entry.Effects>
-                <effects:KeyboardEnableEffect/>
-            </Entry.Effects>
-        </Entry>
-        <Entry x:Name="Entry4" Text="Hide Keyboard" effects:EnableKeyboardEffect.EnableKeyboard="False" Completed="Entry4_OnCompleted">
-            <Entry.Effects>
-                <effects:KeyboardEnableEffect/>
-            </Entry.Effects>
-        </Entry>
-        <Entry x:Name="Entry5" Text="Hide Keyboard" effects:EnableKeyboardEffect.EnableKeyboard="False" Completed="Entry5_OnCompleted">
-            <Entry.Effects>
-                <effects:KeyboardEnableEffect/>
-            </Entry.Effects>
-        </Entry>
-        <Entry x:Name="Entry6" Text="Hide Keyboard" effects:EnableKeyboardEffect.EnableKeyboard="False" Completed="Entry6_OnCompleted">
+        <Entry x:Name="Entry2" Text="Show Keyboard" effects:EnableKeyboardEffect.EnableKeyboard="True">
             <Entry.Effects>
                 <effects:KeyboardEnableEffect/>
             </Entry.Effects>
diff --git a/Sample/Nuget/Sample/MainPage.xaml.cs b/Sample/Nuget/Sample/MainPage.xaml.cs
index 3f15bf3..ac10cbe 100644
--- a/Sample/Nuget/Sample/MainPage.xaml.cs
+++ b/Sample/Nuget/Sample/MainPage.xaml.cs
@@ -19,35 +19,5 @@ private void button2_clicked(object sender, EventArgs e)
         {
             Entry2.Focus();
         }
-
-        private void Entry1_OnCompleted(object sender, EventArgs e)
-        {
-            Entry3.Focus();
-        }
-
-        private void Entry3_OnCompleted(object sender, EventArgs e)
-        {
-            Entry4.Focus();
-        }
-
-        private void Entry4_OnCompleted(object sender, EventArgs e)
-        {
-            Entry5.Focus();
-        }
-
-        private void Entry5_OnCompleted(object sender, EventArgs e)
-        {
-            Entry6.Focus();
-        }
-
-        private void Entry6_OnCompleted(object sender, EventArgs e)
-        {
-            Entry2.Focus();
-        }
-
-        private void Entry2_OnCompleted(object sender, EventArgs e)
-        {
-            Entry1.Focus();
-        }
     }
 }
diff --git a/Sample/Nuget/Sample/Sample.csproj b/Sample/Nuget/Sample/Sample.csproj
index b6a344d..c5f3fc3 100644
--- a/Sample/Nuget/Sample/Sample.csproj
+++ b/Sample/Nuget/Sample/Sample.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.EnableKeyboardEffect" Version="1.0.5" />
-    <PackageReference Include="Xamarin.Forms" Version="3.4.0.1029999" />
+    <PackageReference Include="Xamarin.EnableKeyboardEffect" Version="1.0.6" />
+    <PackageReference Include="Xamarin.Forms" Version="3.0.0.446417" />
   </ItemGroup>
 </Project>
\ No newline at end of file