diff --git a/.travis.yml b/.travis.yml
index fd014400..c727689e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,9 +14,9 @@ android:
     - platform-tools
     - tools
     - build-tools-26.0.0
-    - android-22
+    - android-16
     - android-26
-    - sys-img-armeabi-v7a-android-22
+    - sys-img-armeabi-v7a-android-16
     - extra-android-m2repository
     - extra-android-support
     - extra-google-m2repository
diff --git a/gradle.properties b/gradle.properties
index e4c9d06b..bae547d3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,7 +14,7 @@ org.gradle.daemon=true
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
-org.gradle.jvmargs=-Xmx2560Mm -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
diff --git a/wisefy/build.gradle b/wisefy/build.gradle
index 54c8e86d..f32957ed 100644
--- a/wisefy/build.gradle
+++ b/wisefy/build.gradle
@@ -16,13 +16,6 @@ dexcount {
 android {
 
     dexOptions {
-        // Sets the maximum number of DEX processes
-        // that can be started concurrently.
-        maxProcessCount 8
-        // Sets the maximum memory allocation pool size
-        // for the dex operation.
-        javaMaxHeapSize "2g"
-
         // Skip pre-dexing when running on Travis CI or when disabled via -Dpre-dex=false.
         preDexLibraries = preDexEnabled && !travisBuild
     }