diff --git a/src/JavaFileStorageBindings/Jars/okhttp-3.4.1.jar b/src/JavaFileStorageBindings/Jars/okhttp-3.4.1.jar
deleted file mode 100644
index e31f2486..00000000
Binary files a/src/JavaFileStorageBindings/Jars/okhttp-3.4.1.jar and /dev/null differ
diff --git a/src/JavaFileStorageBindings/Jars/okhttp-3.9.0.jar b/src/JavaFileStorageBindings/Jars/okhttp-3.9.0.jar
new file mode 100644
index 00000000..58ad4beb
Binary files /dev/null and b/src/JavaFileStorageBindings/Jars/okhttp-3.9.0.jar differ
diff --git a/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj b/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj
index 64a279cb..796faa70 100644
--- a/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj
+++ b/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj
@@ -89,9 +89,6 @@
       <Visible>False</Visible>
     </XamarinComponentReference>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedReferenceJar Include="Jars\okhttp-3.4.1.jar" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedReferenceJar Include="Jars\okhttp-digest-1.7.jar" />
   </ItemGroup>
@@ -161,4 +158,7 @@
   <ItemGroup>
     <EmbeddedJar Include="Jars\dropbox-core-sdk-3.0.3.jar" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedReferenceJar Include="Jars\okhttp-3.9.0.jar" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/java/JavaFileStorage/app/build.gradle b/src/java/JavaFileStorage/app/build.gradle
index 1893dec3..547c20c2 100644
--- a/src/java/JavaFileStorage/app/build.gradle
+++ b/src/java/JavaFileStorage/app/build.gradle
@@ -22,28 +22,14 @@ android {
 }
 
 dependencies {
-    /*
-            //compile files('libs/google-api-services-drive-v2-rev102-1.16.0-rc')
-            compile 'com.google.android.gms:play-services:6.5.+'
-            compile 'com.google.api-client:google-api-client-xml:1.18.0-rc'
-            compile 'com.google.http-client:google-http-client-gson:1.18.0-rc'
-            compile 'com.google.api-client:google-api-client-android:1.18.0-rc'
-            compile 'com.google.apis:google-api-services-drive:v2-rev155-1.19.0'
-        */
-    compile 'com.squareup.okhttp3:okhttp:3.4.1'
+    compile 'com.squareup.okhttp3:okhttp:3.9.0'
     compile 'com.burgstaller:okhttp-digest:1.7'
-    //    compile files('libs/dropbox-android-sdk-1.6.2.jar')
     compile 'com.google.android.gms:play-services:4.0.30'
-    /*  compile('com.google.api-client:google-api-client-xml:1.16.0-rc') {
-                exclude group: 'com.google.android.google-play-services'
-            }*/
     compile 'com.google.http-client:google-http-client-gson:1.16.0-rc'
     compile('com.google.api-client:google-api-client-android:1.16.0-rc') {
         exclude group: 'com.google.android.google-play-services'
     }
     compile 'com.google.apis:google-api-services-drive:v2-rev102-1.16.0-rc'
-    //compile 'com.dropbox.core:dropbox-core-sdk:2.0.1'
-    //compile group: 'com.dropbox.core', name: 'dropbox-core-sdk', version: '0-SNAPSHOT', changing: true
     compile 'com.dropbox.core:dropbox-core-sdk:3.0.3'
     //onedrive:
     compile('com.onedrive.sdk:onedrive-sdk-android:1.2+') {
@@ -52,22 +38,5 @@ dependencies {
     compile 'com.google.code.gson:gson:2.3.1'
     compile 'com.microsoft.services.msa:msa-auth:0.8.+'
     compile 'com.microsoft.aad:adal:1.1.+'
-    /*  compile 'com.google.http-client:google-http-client-gson:1.20.0'
-              compile 'com.google.code.gson:gson:2.1'
-              compile files('libs/commons-logging-1.1.1.jar')
-              compile files('libs/dropbox-android-sdk-1.6.2.jar')
-              compile files('libs/google-api-client-1.16.0-rc.jar')
-              compile files('libs/google-api-client-android-1.16.0-rc.jar')
-              compile files('libs/google-http-client-1.16.0-rc.jar')
-              compile files('libs/google-http-client-android-1.16.0-rc.jar')
-              compile files('libs/google-http-client-jackson-1.16.0-rc.jar')
-              compile files('libs/google-http-client-jackson2-1.16.0-rc.jar')
-              compile files('libs/google-oauth-client-1.16.0-rc.jar')
-              compile files('libs/httpclient-4.0.3.jar')
-              compile files('libs/httpcore-4.0.1.jar')
-              compile files('libs/httpmime-4.0.3.jar')
-              compile files('libs/jackson-core-2.1.3.jar')
-              compile files('libs/jackson-core-asl-1.9.11.jar')
-              compile files('libs/json_simple-1.1.jar')
-              compile files('libs/jsr305-1.3.9.jar')*/
+
 }
diff --git a/src/java/JavaFileStorage/app/build/outputs/aar/JavaFileStorage-debug.aar b/src/java/JavaFileStorage/app/build/outputs/aar/JavaFileStorage-debug.aar
deleted file mode 100644
index 1a0f705f..00000000
Binary files a/src/java/JavaFileStorage/app/build/outputs/aar/JavaFileStorage-debug.aar and /dev/null differ
diff --git a/src/java/JavaFileStorage/app/build/outputs/aar/JavaFileStorage-release.aar b/src/java/JavaFileStorage/app/build/outputs/aar/JavaFileStorage-release.aar
deleted file mode 100644
index 6e348665..00000000
Binary files a/src/java/JavaFileStorage/app/build/outputs/aar/JavaFileStorage-release.aar and /dev/null differ
diff --git a/src/java/android-filechooser-AS/app/android-filechooser.iml b/src/java/android-filechooser-AS/app/android-filechooser.iml
index 813c0025..502e8ea8 100644
--- a/src/java/android-filechooser-AS/app/android-filechooser.iml
+++ b/src/java/android-filechooser-AS/app/android-filechooser.iml
@@ -77,23 +77,16 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />