diff --git a/app/build.gradle b/app/build.gradle
index 33b2993aa..4121b731a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -49,9 +49,6 @@ dependencies {
   implementation "com.android.support:support-v4:$supportLibraryVersion"
   implementation "com.android.support:design:$supportLibraryVersion"
   implementation "com.android.support:cardview-v7:$supportLibraryVersion"
-  implementation 'com.android.support:multidex:1.0.2'
-
-  implementation 'com.android.support.constraint:constraint-layout:1.0.2'
 
   androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3'
 
@@ -120,7 +117,7 @@ dependencies {
   androidTestImplementation "org.mockito:mockito-android:2.24.5"
 
   // Leak canary
-  implementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
+  implementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3'
   // Only enable leak canary in debug builds
   configurations.all { config ->
     if (config.name.contains('debug') || config.name.contains("Debug")) {
@@ -166,7 +163,6 @@ android {
     testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     // See https://github.com/linkedin/dexmaker/issues/65 for why we need the following line.
     testInstrumentationRunnerArguments.notClass = 'com.android.dex.DexIndexOverflowException'
-    multiDexEnabled true
     vectorDrawables.useSupportLibrary = true
   }
 
@@ -200,8 +196,6 @@ android {
       buildConfigField "boolean", "KIWIX_ERROR_ACTIVITY", "false"
       // True breaks local variables being shown in breakpoints
       testCoverageEnabled false
-      // Needed for instrumentation tests on Pre 5.0
-      multiDexKeepProguard file('multidex-instrumentation-config.pro')
     }
 
     mock_network {
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/KiwixApplication.java b/app/src/main/java/org/kiwix/kiwixmobile/KiwixApplication.java
index 975c6f97f..d21217f6a 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/KiwixApplication.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/KiwixApplication.java
@@ -18,26 +18,22 @@
 package org.kiwix.kiwixmobile;
 
 import android.app.Activity;
+import android.app.Application;
 import android.content.Context;
 import android.os.Environment;
-import android.support.multidex.MultiDexApplication;
-import android.util.Log;
 import android.support.v7.app.AppCompatDelegate;
+import android.util.Log;
 import com.squareup.leakcanary.LeakCanary;
-import org.kiwix.kiwixmobile.di.components.ApplicationComponent;
-import org.kiwix.kiwixmobile.di.components.DaggerApplicationComponent;
-import org.kiwix.kiwixmobile.di.modules.ApplicationModule;
-
-import java.io.File;
-import java.io.IOException;
-
-import javax.inject.Inject;
-
 import dagger.android.AndroidInjector;
 import dagger.android.DispatchingAndroidInjector;
 import dagger.android.HasActivityInjector;
+import java.io.File;
+import java.io.IOException;
+import javax.inject.Inject;
+import org.kiwix.kiwixmobile.di.components.ApplicationComponent;
+import org.kiwix.kiwixmobile.di.components.DaggerApplicationComponent;
 
-public class KiwixApplication extends MultiDexApplication implements HasActivityInjector {
+public class KiwixApplication extends Application implements HasActivityInjector {
 
   private static KiwixApplication application;
   private static ApplicationComponent applicationComponent;