diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/AlertDialogFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/AlertDialogFragment.kt
index 186b3410..09dd0af8 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/AlertDialogFragment.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/AlertDialogFragment.kt
@@ -18,7 +18,7 @@ abstract class AlertDialogFragment<Arg : Parcelable, Ret : Parcelable> :
     companion object {
         private const val KEY_ARG = "arg"
         private const val KEY_RET = "ret"
-        fun <T : Parcelable> getRet(data: Intent) = data.extras!!.getParcelable<T>(KEY_RET)!!
+        fun <T : Parcelable> getRet(data: Intent) = data.getParcelableExtra<T>(KEY_RET)!!
     }
     protected abstract fun AlertDialog.Builder.prepare(listener: DialogInterface.OnClickListener)
 
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/room/ClientRecord.kt b/mobile/src/main/java/be/mygod/vpnhotspot/room/ClientRecord.kt
index 90ffea00..786e6dc6 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/room/ClientRecord.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/room/ClientRecord.kt
@@ -2,7 +2,6 @@ package be.mygod.vpnhotspot.room
 
 import androidx.lifecycle.LiveData
 import androidx.room.*
-import kotlinx.coroutines.runBlocking
 
 @Entity
 data class ClientRecord(@PrimaryKey