diff --git a/app/src/main/java/de/kuschku/quasseldroid/service/QuasseldroidNotificationManager.kt b/app/src/main/java/de/kuschku/quasseldroid/service/QuasseldroidNotificationManager.kt
index 4d0911c5d9d29aae04929d2e294347e1adee923a..2b6764405b47a04dbb96cea52878626044ca2e71 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/service/QuasseldroidNotificationManager.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/service/QuasseldroidNotificationManager.kt
@@ -33,6 +33,7 @@ import android.graphics.Canvas
 import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.os.Build
+import androidx.annotation.RequiresApi
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
@@ -73,7 +74,7 @@ class QuasseldroidNotificationManager @Inject constructor(private val context: C
       prepareChannels()
   }
 
-  @TargetApi(Build.VERSION_CODES.O)
+  @RequiresApi(Build.VERSION_CODES.O)
   private fun prepareChannels() {
     val notificationManager =
       context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/AndroidHandlerThread.kt b/app/src/main/java/de/kuschku/quasseldroid/util/AndroidHandlerThread.kt
index d6eb1e305dff3b08e56726650298db2c2282e93c..ca67b2092feb7e8a21cef55e6c2436b600c41a81 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/AndroidHandlerThread.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/AndroidHandlerThread.kt
@@ -113,14 +113,6 @@ class AndroidHandlerThread(name: String) : HandlerThread(name) {
     started().let { handler?.postAtFrontOfQueue(r) }
     ?: throw RuntimeException("Thread not started")
 
-  fun removeCallbacks(r: () -> Unit) =
-    started().let { handler?.removeCallbacks(r) }
-    ?: throw RuntimeException("Thread not started")
-
-  fun removeCallbacks(r: () -> Unit, token: Any) =
-    started().let { handler?.removeCallbacks(r, token) }
-    ?: throw RuntimeException("Thread not started")
-
   fun sendMessage(msg: Message): Boolean =
     started().let { handler?.sendMessage(msg) }
     ?: throw RuntimeException("Thread not started")
diff --git a/lint.xml b/lint.xml
index ce055fb69bcf3b72eb457687d63f8d56a9d2cab7..4f04f03ffe3a537312c7c88991e3b1ccc09c85f6 100644
--- a/lint.xml
+++ b/lint.xml
@@ -54,4 +54,5 @@
   <issue id="NewerVersionAvailable" severity="informational"/>
   <issue id="SetTextI18n" severity="informational"/>
   <issue id="DefaultLocale" severity="informational"/>
+  <issue id="UseKtx" severity="informational"/>
 </lint>