diff --git a/osu.Android/GameView.cs b/osu.Android/GameView.cs
index dfae65a2e9..fc9cdeda53 100644
--- a/osu.Android/GameView.cs
+++ b/osu.Android/GameView.cs
@@ -20,6 +20,6 @@ namespace osu.Android
         {
             CreateGame();
         }
-        public override Framework.Game CreateGame() => new OsuGameAndroid();
+        public override Framework.Game CreateGame() => new OsuGame();
     }
 }
diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
deleted file mode 100644
index e2f016887d..0000000000
--- a/osu.Android/OsuGameAndroid.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Android;
-using osu.Framework.Platform;
-using osu.Game;
-using System;
-using System.IO;
-
-namespace osu.Android
-{
-    internal class OsuGameAndroid : OsuGame
-    {
-        public OsuGameAndroid() : base()
-        {
-
-        }
-        public override Storage GetStorageForStableInstall()
-        {
-            return new OpsuStorage();
-        }
-
-        // For better migration from opsu! to osu!lazer (WIP)
-        private class OpsuStorage : AndroidStorage
-        {
-            bool checkExists(string p) => Directory.Exists(Path.Combine(p, "Songs"));
-
-            protected override string LocateBasePath()
-            {
-                BasePath = base.LocateBasePath();
-                string opsuInstallPath = Path.Combine(BasePath, "opsu");
-                Console.WriteLine(opsuInstallPath);
-                if (checkExists(opsuInstallPath))
-                    return opsuInstallPath;
-                return null;
-            }
-
-            public OpsuStorage() : base(string.Empty, null)
-            {
-                BasePath = LocateBasePath();
-            }
-        }
-    }
-}
diff --git a/osu.Android/Properties/AndroidManifest.xml b/osu.Android/Properties/AndroidManifest.xml
index 4ae7d35c2e..76cb58969f 100644
--- a/osu.Android/Properties/AndroidManifest.xml
+++ b/osu.Android/Properties/AndroidManifest.xml
@@ -4,5 +4,6 @@
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
+	<uses-permission android:name="android.permission.READ_FRAME_BUFFER" />
 	<application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"></application>
 </manifest>
\ No newline at end of file
diff --git a/osu.Android/osu.Android.csproj b/osu.Android/osu.Android.csproj
index 42e472bc83..8a481b5239 100644
--- a/osu.Android/osu.Android.csproj
+++ b/osu.Android/osu.Android.csproj
@@ -40,6 +40,7 @@
     <BundleAssemblies>false</BundleAssemblies>
     <MandroidI18n>CJK;Mideast;Rare;West;Other</MandroidI18n>
     <AndroidSupportedAbis />
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -63,7 +64,6 @@
   <ItemGroup>
     <Compile Include="GameView.cs" />
     <Compile Include="MainActivity.cs" />
-    <Compile Include="OsuGameAndroid.cs" />
     <Compile Include="Resources\Resource.designer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>