diff --git a/src/JavaFileStorageBindings/Jars/livesdk.jar b/src/JavaFileStorageBindings/Jars/livesdk.jar
deleted file mode 100644
index c21d2252..00000000
Binary files a/src/JavaFileStorageBindings/Jars/livesdk.jar and /dev/null differ
diff --git a/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj b/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj
index df382ed3..d2cab9d7 100644
--- a/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj
+++ b/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj
@@ -150,9 +150,6 @@
       <Link>Jars\jsr305-1.3.9.jar</Link>
     </EmbeddedReferenceJar>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedReferenceJar Include="Jars\livesdk.jar" />
-  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/JavaFileStorageBindings/Transforms/Metadata.xml b/src/JavaFileStorageBindings/Transforms/Metadata.xml
index 5219b2c0..be431ec6 100644
--- a/src/JavaFileStorageBindings/Transforms/Metadata.xml
+++ b/src/JavaFileStorageBindings/Transforms/Metadata.xml
@@ -10,4 +10,5 @@
 	<remove-node path="/api/package[@name='com.jcraft.jsch.jce']" />
 	<remove-node path="/api/package[@name='com.jcraft.jsch.jcraft']" />
 	<remove-node path="/api/package[@name='com.jcraft.jzlib']" />
+	<remove-node path="/api/package[@name='com.microsoft.live']" />
 </metadata>
diff --git a/src/Kp2aBusinessLogic/Io/BuiltInFileStorage.cs b/src/Kp2aBusinessLogic/Io/BuiltInFileStorage.cs
index df44549e..f856f4cc 100644
--- a/src/Kp2aBusinessLogic/Io/BuiltInFileStorage.cs
+++ b/src/Kp2aBusinessLogic/Io/BuiltInFileStorage.cs
@@ -245,6 +245,11 @@ namespace keepass2android.Io
 			activity.OnImmediateResult(requestCode, (int) FileStorageResults.FileUsagePrepared, intent);
 		}
 
+		public void PrepareFileUsage(Context ctx, IOConnectionInfo ioc)
+		{
+			//nothing to do, we're ready to go
+		}
+
 		public void OnCreate(IFileStorageSetupActivity activity, Bundle savedInstanceState)
 		{
 			throw new NotImplementedException();
diff --git a/src/Kp2aBusinessLogic/Io/IFileStorage.cs b/src/Kp2aBusinessLogic/Io/IFileStorage.cs
index 31a68ae3..1ae092f9 100644
--- a/src/Kp2aBusinessLogic/Io/IFileStorage.cs
+++ b/src/Kp2aBusinessLogic/Io/IFileStorage.cs
@@ -124,6 +124,14 @@ namespace keepass2android.Io
 		/// </summary>
 		void PrepareFileUsage(IFileStorageSetupInitiatorActivity activity, IOConnectionInfo ioc, int requestCode, bool alwaysReturnSuccess);
 
+		/// <summary>
+		/// Initiates the process for using a file in the given file storage.
+		/// This method either silently prepares using the file (if any preparation is required) or throws
+		/// UserInteractionRequiredException (or any other exception in case of an error). 
+		/// Can be used from a service, i.e. when no Activity is open.
+		/// </summary>
+		void PrepareFileUsage(Context ctx, IOConnectionInfo ioc);
+
 		//Setup methods: these are called from the setup activity so the file storage can handle UI events for authorization etc.
 		void OnCreate(IFileStorageSetupActivity activity, Bundle savedInstanceState);
 		void OnResume(IFileStorageSetupActivity activity);
diff --git a/src/Kp2aBusinessLogic/Io/JavaFileStorage.cs b/src/Kp2aBusinessLogic/Io/JavaFileStorage.cs
index b423a093..19a85904 100644
--- a/src/Kp2aBusinessLogic/Io/JavaFileStorage.cs
+++ b/src/Kp2aBusinessLogic/Io/JavaFileStorage.cs
@@ -244,6 +244,11 @@ namespace keepass2android.Io
 			_jfs.PrepareFileUsage((IJavaFileStorageFileStorageSetupInitiatorActivity)activity, IocToPath(ioc), requestCode, alwaysReturnSuccess);
 		}
 
+		public void PrepareFileUsage(Context ctx, IOConnectionInfo ioc)
+		{
+			_jfs.PrepareFileUsage(ctx, IocToPath(ioc));
+		}
+
 		public void OnCreate(IFileStorageSetupActivity activity, Bundle savedInstanceState)
 		{
 			_jfs.OnCreate(((IJavaFileStorageFileStorageSetupActivity)activity), savedInstanceState);
diff --git a/src/java/JavaFileStorage/bin/javafilestorage.jar b/src/java/JavaFileStorage/bin/javafilestorage.jar
index 060c0f5c..9c44faa9 100644
Binary files a/src/java/JavaFileStorage/bin/javafilestorage.jar and b/src/java/JavaFileStorage/bin/javafilestorage.jar differ