diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e7bdcdb7bac66c4870cb4b28a77d12199c06ede7..38acdf4b97d6be053421ee031973efc271e0ee26 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -176,11 +176,8 @@ dependencies {
 
   // Quality Assurance
   implementation(project(":malheur"))
-  withVersion("1.6.3") {
+  withVersion("2.2") {
     debugImplementation("com.squareup.leakcanary", "leakcanary-android", version)
-    releaseImplementation("com.squareup.leakcanary", "leakcanary-android-no-op", version)
-    testImplementation("com.squareup.leakcanary", "leakcanary-android-no-op", version)
-    androidTestImplementation("com.squareup.leakcanary", "leakcanary-android-no-op", version)
   }
 
   // Dependency Injection
diff --git a/app/src/main/java/de/kuschku/quasseldroid/app/AppDelegate.kt b/app/src/main/java/de/kuschku/quasseldroid/app/AppDelegate.kt
index 474ba1d651d9490995464761c49163c5d9af3aa2..d0f388010485471f1790fc14cf8694563f92bb8e 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/app/AppDelegate.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/app/AppDelegate.kt
@@ -1,8 +1,8 @@
 /*
  * Quasseldroid - Quassel client for Android
  *
- * Copyright (c) 2019 Janne Mareike Koschinski
- * Copyright (c) 2019 The Quassel Project
+ * Copyright (c) 2020 Janne Mareike Koschinski
+ * Copyright (c) 2020 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3 as published
@@ -20,7 +20,6 @@
 package de.kuschku.quasseldroid.app
 
 interface AppDelegate {
-  fun shouldInit(): Boolean
   fun onAttachBaseContext()
   fun onPreInit()
   fun onInit()
diff --git a/app/src/main/java/de/kuschku/quasseldroid/app/QuasseldroidBaseDelegate.kt b/app/src/main/java/de/kuschku/quasseldroid/app/QuasseldroidBaseDelegate.kt
index e3d50a251f713e57ad8c95af610f32c48ea17ce6..72d158d93d2d73a71cbfe5223215a6956c4d101f 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/app/QuasseldroidBaseDelegate.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/app/QuasseldroidBaseDelegate.kt
@@ -1,8 +1,8 @@
 /*
  * Quasseldroid - Quassel client for Android
  *
- * Copyright (c) 2019 Janne Mareike Koschinski
- * Copyright (c) 2019 The Quassel Project
+ * Copyright (c) 2020 Janne Mareike Koschinski
+ * Copyright (c) 2020 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3 as published
@@ -29,8 +29,6 @@ import de.kuschku.quasseldroid.util.compatibility.AndroidLoggingHandler
 import de.kuschku.quasseldroid.util.compatibility.AndroidStreamChannelFactory
 
 open class QuasseldroidBaseDelegate(private val app: Quasseldroid) : AppDelegate {
-  override fun shouldInit() = true
-
   override fun onPreInit() = Unit
 
   override fun onInit() {
diff --git a/app/src/main/java/de/kuschku/quasseldroid/app/QuasseldroidReleaseDelegate.kt b/app/src/main/java/de/kuschku/quasseldroid/app/QuasseldroidReleaseDelegate.kt
index ef97f538c045a5249a7033762f989483e73347d2..0d274270af0479b2e6b1cbfaeb5d5a710fd40cdf 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/app/QuasseldroidReleaseDelegate.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/app/QuasseldroidReleaseDelegate.kt
@@ -22,7 +22,6 @@ package de.kuschku.quasseldroid.app
 import android.annotation.SuppressLint
 import android.os.Build
 import android.os.StrictMode
-import com.squareup.leakcanary.LeakCanary
 import de.kuschku.malheur.CrashHandler
 import de.kuschku.quasseldroid.BuildConfig
 import de.kuschku.quasseldroid.Quasseldroid
@@ -38,10 +37,7 @@ import de.kuschku.quasseldroid.settings.SettingsMigrationManager
 import de.kuschku.quasseldroid.util.helper.letIf
 
 class QuasseldroidReleaseDelegate(private val app: Quasseldroid) : QuasseldroidBaseDelegate(app) {
-  override fun shouldInit() = !LeakCanary.isInAnalyzerProcess(app)
-
   override fun onPreInit() {
-    LeakCanary.install(app)
     CrashHandler.init<BuildConfig>(application = app)
   }
 
diff --git a/app/src/test/java/de/kuschku/quasseldroid/app/QuasseldroidTestDelegate.kt b/app/src/test/java/de/kuschku/quasseldroid/app/QuasseldroidTestDelegate.kt
index e886329b5d479891d44b1854c29fd2563431f313..b831a91d929a26588d3ad6c6503b7b7ff20dee92 100644
--- a/app/src/test/java/de/kuschku/quasseldroid/app/QuasseldroidTestDelegate.kt
+++ b/app/src/test/java/de/kuschku/quasseldroid/app/QuasseldroidTestDelegate.kt
@@ -1,8 +1,8 @@
 /*
  * Quasseldroid - Quassel client for Android
  *
- * Copyright (c) 2019 Janne Mareike Koschinski
- * Copyright (c) 2019 The Quassel Project
+ * Copyright (c) 2020 Janne Mareike Koschinski
+ * Copyright (c) 2020 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3 as published
@@ -20,7 +20,6 @@
 package de.kuschku.quasseldroid.app
 
 class QuasseldroidTestDelegate : AppDelegate {
-  override fun shouldInit() = true
   override fun onAttachBaseContext() = Unit
   override fun onPreInit() = Unit
   override fun onInit() = Unit