diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt
index 9b609b96e336ac1503cd8e85b642cc106b9ec0b9..92168088e4b0debc6f1af04a22741f218c0da173 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt
@@ -5,6 +5,7 @@ import android.arch.paging.LivePagedListBuilder
 import android.arch.paging.PagedList
 import android.content.ClipData
 import android.content.ClipboardManager
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.support.design.widget.FloatingActionButton
@@ -106,7 +107,7 @@ class MessageListFragment : ServiceBoundFragment() {
         else
           builder
 
-        val clipboard = requireContext().systemService<ClipboardManager>()
+        val clipboard = requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
         val clip = ClipData.newPlainText(null, data)
         clipboard.primaryClip = clip
         actionMode?.finish()
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/QuasseldroidNotificationManager.kt b/app/src/main/java/de/kuschku/quasseldroid/util/QuasseldroidNotificationManager.kt
index 4623c8d3b24af5918547ced88b4e0928fabb4eec..a4556b998c4f8debc54af02dd5bc99459d5fd670 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/QuasseldroidNotificationManager.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/QuasseldroidNotificationManager.kt
@@ -15,7 +15,6 @@ import de.kuschku.quasseldroid.ui.chat.ChatActivity
 import de.kuschku.quasseldroid.util.helper.editApply
 import de.kuschku.quasseldroid.util.helper.getColorCompat
 import de.kuschku.quasseldroid.util.helper.sharedPreferences
-import de.kuschku.quasseldroid.util.helper.systemService
 
 class QuasseldroidNotificationManager(private val context: Context) {
   fun init() {
@@ -25,7 +24,7 @@ class QuasseldroidNotificationManager(private val context: Context) {
 
   @TargetApi(Build.VERSION_CODES.O)
   private fun prepareChannels() {
-    val notificationManager = context.systemService<NotificationManager>()
+    val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
     notificationManager.createNotificationChannels(
       listOf(
         NotificationChannel(
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/helper/ContextHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/ContextHelper.kt
index bcd39daaeeac2aa76ffa8719971347c252d463a5..0e0942bb7d63a197396ccc9a61ef7fbc1a4a4d2c 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/helper/ContextHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/ContextHelper.kt
@@ -2,7 +2,6 @@ package de.kuschku.quasseldroid.util.helper
 
 import android.content.Context
 import android.content.SharedPreferences
-import android.os.Build
 import android.preference.PreferenceManager
 import android.support.annotation.ColorInt
 import android.support.annotation.ColorRes
@@ -10,13 +9,6 @@ import android.support.annotation.DrawableRes
 import android.support.graphics.drawable.VectorDrawableCompat
 import android.support.v4.content.ContextCompat
 
-inline fun <reified T> Context.systemService(): T =
-  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-    getSystemService(T::class.java)
-  } else {
-    getSystemService(T::class.java.simpleName) as T
-  }
-
 fun Context.getDrawableCompat(@DrawableRes id: Int) = ContextCompat.getDrawable(this, id)
 
 fun Context.getVectorDrawableCompat(@DrawableRes id: Int) =
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ui/LinkLongClickMenuHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/ui/LinkLongClickMenuHelper.kt
index 89685a9842a34d0b12cc4241665ffecb9ceb06aa..ea042b88f6ae3e7ccbc839449d91fb8dec541d5b 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ui/LinkLongClickMenuHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/LinkLongClickMenuHelper.kt
@@ -2,11 +2,11 @@ package de.kuschku.quasseldroid.util.ui
 
 import android.content.ClipData
 import android.content.ClipboardManager
+import android.content.Context
 import android.content.Intent
 import android.support.v7.widget.PopupMenu
 import android.widget.TextView
 import de.kuschku.quasseldroid.R
-import de.kuschku.quasseldroid.util.helper.systemService
 import me.saket.bettermovementmethod.BetterLinkMovementMethod
 
 class LinkLongClickMenuHelper :
@@ -23,7 +23,7 @@ class LinkLongClickMenuHelper :
         menu.setOnMenuItemClickListener {
           when (it.itemId) {
             R.id.action_copy  -> {
-              val clipboard = anchor.context.systemService<ClipboardManager>()
+              val clipboard = anchor.context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
               val clip = ClipData.newPlainText(null, url)
               clipboard.primaryClip = clip
               menu.dismiss()