diff --git a/src/JavaFileStorageBindings/Jars/msa-auth-0.8.6/AndroidManifest.xml b/src/JavaFileStorageBindings/Jars/msa-auth-0.8.6/AndroidManifest.xml
deleted file mode 100644
index 4eea788d..00000000
--- a/src/JavaFileStorageBindings/Jars/msa-auth-0.8.6/AndroidManifest.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.microsoft.services.msa"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="22" />
-
-    <uses-permission android:name="com.sony.mobile.permission.SYSTEM_UI_VISIBILITY_EXTENSION" />
-
-</manifest>
\ No newline at end of file
diff --git a/src/JavaFileStorageBindings/Jars/msa-auth-0.8.6/R.txt b/src/JavaFileStorageBindings/Jars/msa-auth-0.8.6/R.txt
deleted file mode 100644
index a80644ba..00000000
--- a/src/JavaFileStorageBindings/Jars/msa-auth-0.8.6/R.txt
+++ /dev/null
@@ -1 +0,0 @@
-int string app_name 0x7f020000
diff --git a/src/JavaFileStorageBindings/Jars/msa-auth-0.8.6/aapt/AndroidManifest.xml b/src/JavaFileStorageBindings/Jars/msa-auth-0.8.6/aapt/AndroidManifest.xml
deleted file mode 100644
index 4eea788d..00000000
--- a/src/JavaFileStorageBindings/Jars/msa-auth-0.8.6/aapt/AndroidManifest.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.microsoft.services.msa"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="22" />
-
-    <uses-permission android:name="com.sony.mobile.permission.SYSTEM_UI_VISIBILITY_EXTENSION" />
-
-</manifest>
\ No newline at end of file
diff --git a/src/JavaFileStorageBindings/Jars/msa-auth-0.8.6/classes-msa-auth.jar b/src/JavaFileStorageBindings/Jars/msa-auth-0.8.6/classes-msa-auth.jar
deleted file mode 100644
index e8e60837..00000000
Binary files a/src/JavaFileStorageBindings/Jars/msa-auth-0.8.6/classes-msa-auth.jar and /dev/null differ
diff --git a/src/JavaFileStorageBindings/Jars/msa-auth-0.8.6/res/values/values.xml b/src/JavaFileStorageBindings/Jars/msa-auth-0.8.6/res/values/values.xml
deleted file mode 100644
index a80d8fc5..00000000
--- a/src/JavaFileStorageBindings/Jars/msa-auth-0.8.6/res/values/values.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- From: file:/C:/Users/pnied/Documents/git/msa-auth-for-android/src/main/res/values/strings.xml -->
-    <eat-comment/>
-    <string name="app_name">msa-auth</string>
-</resources>
\ No newline at end of file
diff --git a/src/JavaFileStorageBindings/Jars/onedrive-sdk-android-1.2.2/AndroidManifest.xml b/src/JavaFileStorageBindings/Jars/onedrive-sdk-android-1.2.2/AndroidManifest.xml
deleted file mode 100644
index b26377f9..00000000
--- a/src/JavaFileStorageBindings/Jars/onedrive-sdk-android-1.2.2/AndroidManifest.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.microsoft.onedrivesdk"
-    android:versionCode="10202"
-    android:versionName="1.2.2" >
-
-    <uses-sdk
-        android:minSdkVersion="15"
-        android:targetSdkVersion="23" />
-
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-
-</manifest>
\ No newline at end of file
diff --git a/src/JavaFileStorageBindings/Jars/onedrive-sdk-android-1.2.2/R.txt b/src/JavaFileStorageBindings/Jars/onedrive-sdk-android-1.2.2/R.txt
deleted file mode 100644
index 8fe0dccb..00000000
--- a/src/JavaFileStorageBindings/Jars/onedrive-sdk-android-1.2.2/R.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-int dimen activity_horizontal_margin 0x7f030000
-int dimen activity_vertical_margin 0x7f030001
-int id LinearLayout1 0x7f060004
-int id com_microsoft_aad_adal_editDummyText 0x7f060002
-int id com_microsoft_aad_adal_progressBar 0x7f060003
-int id com_microsoft_aad_adal_webView1 0x7f060001
-int id editPassword 0x7f060006
-int id editUserName 0x7f060005
-int id webView1 0x7f060000
-int layout activity_authentication 0x7f020000
-int layout dialog_authentication 0x7f020001
-int layout http_auth_dialog 0x7f020002
-int string app_loading 0x7f050000
-int string app_name 0x7f050001
-int string broker_processing 0x7f050002
-int string http_auth_dialog_cancel 0x7f050003
-int string http_auth_dialog_login 0x7f050004
-int string http_auth_dialog_password 0x7f050005
-int string http_auth_dialog_title 0x7f050006
-int string http_auth_dialog_username 0x7f050007
-int style AppBaseTheme 0x7f040000
-int style AppTheme 0x7f040001
diff --git a/src/JavaFileStorageBindings/Jars/onedrive-sdk-android-1.2.2/aapt/AndroidManifest.xml b/src/JavaFileStorageBindings/Jars/onedrive-sdk-android-1.2.2/aapt/AndroidManifest.xml
deleted file mode 100644
index b26377f9..00000000
--- a/src/JavaFileStorageBindings/Jars/onedrive-sdk-android-1.2.2/aapt/AndroidManifest.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.microsoft.onedrivesdk"
-    android:versionCode="10202"
-    android:versionName="1.2.2" >
-
-    <uses-sdk
-        android:minSdkVersion="15"
-        android:targetSdkVersion="23" />
-
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-
-</manifest>
\ No newline at end of file
diff --git a/src/JavaFileStorageBindings/Jars/onedrive-sdk-android-1.2.2/classes-onedrive-sdk.jar b/src/JavaFileStorageBindings/Jars/onedrive-sdk-android-1.2.2/classes-onedrive-sdk.jar
deleted file mode 100644
index b806c879..00000000
Binary files a/src/JavaFileStorageBindings/Jars/onedrive-sdk-android-1.2.2/classes-onedrive-sdk.jar and /dev/null differ
diff --git a/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj b/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj
index e3ca901c..fd984719 100644
--- a/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj
+++ b/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj
@@ -212,12 +212,6 @@
       <Name>PCloudBindings</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedReferenceJar Include="Jars\msa-auth-0.8.6\classes-msa-auth.jar" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedReferenceJar Include="Jars\onedrive-sdk-android-1.2.2\classes-onedrive-sdk.jar" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedReferenceJar Include="Jars\gdrive\commons-logging-1.1.1.jar" />
   </ItemGroup>
@@ -290,6 +284,7 @@
   <ItemGroup>
     <EmbeddedReferenceJar Include="Jars\gdrive\opencensus-api-0.24.0.jar" />
   </ItemGroup>
+  <ItemGroup />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
diff --git a/src/keepass2android/app/App.cs b/src/keepass2android/app/App.cs
index f04c045d..eff61626 100644
--- a/src/keepass2android/app/App.cs
+++ b/src/keepass2android/app/App.cs
@@ -828,7 +828,7 @@ namespace keepass2android
 							new DropboxAppFolderFileStorage(LocaleManager.LocalizedAppContext, this),
                             GoogleApiAvailability.Instance.IsGooglePlayServicesAvailable(LocaleManager.LocalizedAppContext)==ConnectionResult.Success ? new GoogleDriveFileStorage(LocaleManager.LocalizedAppContext, this) : null,
                             GoogleApiAvailability.Instance.IsGooglePlayServicesAvailable(LocaleManager.LocalizedAppContext)==ConnectionResult.Success ? new GoogleDriveAppDataFileStorage(LocaleManager.LocalizedAppContext, this) : null,
-							new OneDriveFileStorage(LocaleManager.LocalizedAppContext, this),
+							new OneDriveFileStorage(),
 						    new OneDrive2FullFileStorage(),
 						    new OneDrive2MyFilesFileStorage(),
 						    new OneDrive2AppFolderFileStorage(),