diff --git a/OsmAnd-java/build.gradle b/OsmAnd-java/build.gradle
index 049b4f4d87..9797bb9f4e 100644
--- a/OsmAnd-java/build.gradle
+++ b/OsmAnd-java/build.gradle
@@ -70,6 +70,17 @@ dependencies {
 	testImplementation 'com.google.code.gson:gson:2.8.2'
 	testImplementation 'org.hamcrest:hamcrest-core:1.3'
 
+	implementation group: 'commons-logging', name: 'commons-logging', version: '1.2'
+	implementation group: 'org.json', name: 'json', version: '20171018' 
+	implementation 'it.unibo.alice.tuprolog:tuprolog:3.2.1'
+	implementation 'org.beanshell:bsh-core:2.0b4'
+	implementation 'org.apache.commons:commons-compress:1.17'
+	implementation 'com.moparisthebest:junidecode:0.1.1'
+	implementation 'com.vividsolutions:jts-core:1.14.0'
+
+	implementation 'net.sf.kxml:kxml2:2.1.8'
+	
+
 	implementation fileTree(dir: "libs", include: ["*.jar"])
 }
 
diff --git a/OsmAnd-java/libs/bsh-core-2.0b4.jar b/OsmAnd-java/libs/bsh-core-2.0b4.jar
deleted file mode 100644
index a1b8e47288..0000000000
Binary files a/OsmAnd-java/libs/bsh-core-2.0b4.jar and /dev/null differ
diff --git a/OsmAnd-java/libs/bzip2-20090327.jar b/OsmAnd-java/libs/bzip2-20090327.jar
deleted file mode 100644
index 5a0f290a07..0000000000
Binary files a/OsmAnd-java/libs/bzip2-20090327.jar and /dev/null differ
diff --git a/OsmAnd-java/libs/commons-logging-1.1.1.jar b/OsmAnd-java/libs/commons-logging-1.1.1.jar
deleted file mode 100644
index 1deef144cb..0000000000
Binary files a/OsmAnd-java/libs/commons-logging-1.1.1.jar and /dev/null differ
diff --git a/OsmAnd-java/libs/json-20090211.jar b/OsmAnd-java/libs/json-20090211.jar
deleted file mode 100644
index ef29094093..0000000000
Binary files a/OsmAnd-java/libs/json-20090211.jar and /dev/null differ
diff --git a/OsmAnd-java/libs/jts-core-1.14.0.jar b/OsmAnd-java/libs/jts-core-1.14.0.jar
deleted file mode 100644
index a690bed698..0000000000
Binary files a/OsmAnd-java/libs/jts-core-1.14.0.jar and /dev/null differ
diff --git a/OsmAnd-java/libs/junidecode-0.1.jar b/OsmAnd-java/libs/junidecode-0.1.jar
deleted file mode 100644
index 7c79c879e5..0000000000
Binary files a/OsmAnd-java/libs/junidecode-0.1.jar and /dev/null differ
diff --git a/OsmAnd-java/libs/kxml2-2.3.0.jar b/OsmAnd-java/libs/kxml2-2.3.0.jar
deleted file mode 100644
index 647095222a..0000000000
Binary files a/OsmAnd-java/libs/kxml2-2.3.0.jar and /dev/null differ
diff --git a/OsmAnd-java/libs/simple-logging.jar b/OsmAnd-java/libs/simple-logging.jar
deleted file mode 100644
index 89d3a05766..0000000000
Binary files a/OsmAnd-java/libs/simple-logging.jar and /dev/null differ
diff --git a/OsmAnd-java/libs/tuprolog.jar b/OsmAnd-java/libs/tuprolog.jar
deleted file mode 100644
index 529887697a..0000000000
Binary files a/OsmAnd-java/libs/tuprolog.jar and /dev/null differ
diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index 0c677ef836..7dd7f60baa 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -365,11 +365,11 @@ dependencies {
 	implementation 'com.android.support:customtabs:27.1.1'
 	implementation fileTree(include:  ['gnu-trove-osmand.jar', 'icu4j-49_1_patched.jar'], dir: 'libs')
 
-	implementation 'commons-logging:commons-logging-api:1.1'
+	implementation group: 'commons-logging', name: 'commons-logging', version: '1.2'
 	implementation 'commons-codec:commons-codec:1.11'
 	implementation 'it.unibo.alice.tuprolog:tuprolog:3.2.1'
 	implementation 'org.beanshell:bsh-core:2.0b4'
-	implementation 'fr.univ-valenciennes:bzip2:1.0'
+	implementation 'org.apache.commons:commons-compress:1.17'
 	implementation 'com.moparisthebest:junidecode:0.1.1'
 	implementation 'org.immutables:gson:2.5.0'
 	implementation 'com.vividsolutions:jts-core:1.14.0'
diff --git a/OsmAnd/old-ndk-build.sh b/OsmAnd/old-ndk-build.sh
index 5d1b067aba..39ed616af2 100755
--- a/OsmAnd/old-ndk-build.sh
+++ b/OsmAnd/old-ndk-build.sh
@@ -30,4 +30,4 @@ if [ -z "$OSMAND_X86_ONLY" ] && [ -z "$OSMAND_ARM_ONLY" ] && [ -z "$OSMAND_ARMv5
 fi
 export BUILD_ONLY_OLD_LIB=1
 "$SCRIPT_LOC/../../core-legacy/externals/configure.sh"
-(cd "$SCRIPT_LOC" && "$ANDROID_NDK/ndk-build" -j1)
+(cd "$SCRIPT_LOC" && "$ANDROID_NDK/ndk-build" -j2)