diff --git a/src/main/kotlin/com/looker/droidify/MainApplication.kt b/src/main/kotlin/com/looker/droidify/MainApplication.kt
index 4b2293f6..e7164c87 100644
--- a/src/main/kotlin/com/looker/droidify/MainApplication.kt
+++ b/src/main/kotlin/com/looker/droidify/MainApplication.kt
@@ -83,9 +83,9 @@ class MainApplication : Application(), ImageLoaderFactory {
             addAction(Intent.ACTION_PACKAGE_REMOVED)
             addDataScheme("package")
         })
-        val installedItems =
-            packageManager.getInstalledPackages(Android.PackageManager.signaturesFlag)
-                .map { it.toInstalledItem() }
+        val installedItems = packageManager
+            .getInstalledPackages(Android.PackageManager.signaturesFlag)
+            .map { it.toInstalledItem() }
         CoroutineScope(Dispatchers.Default).launch {
             db.installedDao.put(*installedItems.toTypedArray())
         }
diff --git a/src/main/kotlin/com/looker/droidify/database/DAOs.kt b/src/main/kotlin/com/looker/droidify/database/DAOs.kt
index 8cb657b7..27e848f4 100644
--- a/src/main/kotlin/com/looker/droidify/database/DAOs.kt
+++ b/src/main/kotlin/com/looker/droidify/database/DAOs.kt
@@ -285,7 +285,6 @@ interface InstalledDao : BaseDao<Installed> {
     }
 
     @Query("SELECT * FROM memory_installed WHERE package_name = :packageName")
-    fun get(packageName: String): Cursor
 
     @Query("SELECT * FROM memory_installed WHERE package_name = :packageName")
     fun getObject(packageName: String): Installed?
diff --git a/src/main/kotlin/com/looker/droidify/service/SyncService.kt b/src/main/kotlin/com/looker/droidify/service/SyncService.kt
index 71277f56..5c27f235 100644
--- a/src/main/kotlin/com/looker/droidify/service/SyncService.kt
+++ b/src/main/kotlin/com/looker/droidify/service/SyncService.kt
@@ -443,7 +443,7 @@ class SyncService : ConnectionService<SyncService.Binder>() {
             // run startUpdate on every item
             productItems.map { productItem ->
                 Pair(
-                    db.installedDao.getObject(productItem.packageName),
+                    db.installedDao.get(productItem.packageName),
                     db.repositoryDao.get(productItem.repositoryId)
                 )
             }
diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/AppDetailFragment.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/AppDetailFragment.kt
index a61b18c6..1c6a73be 100644
--- a/src/main/kotlin/com/looker/droidify/ui/fragments/AppDetailFragment.kt
+++ b/src/main/kotlin/com/looker/droidify/ui/fragments/AppDetailFragment.kt
@@ -160,7 +160,7 @@ class AppDetailFragment() : ScreenFragment(), AppDetailAdapter.Callbacks {
             }
             .flatMapSingle { products ->
                 RxUtils
-                    .querySingle { Nullable(screenActivity.db.installedDao.getObject(packageName)) }
+                    .querySingle { Nullable(screenActivity.db.installedDao.get(packageName)) }
                     .map { Pair(products, it) }
             }
             .observeOn(AndroidSchedulers.mainThread())
diff --git a/src/main/kotlin/com/looker/droidify/ui/viewmodels/MainActivityViewModelX.kt b/src/main/kotlin/com/looker/droidify/ui/viewmodels/MainActivityViewModelX.kt
index 687b4cc8..c81a96e8 100644
--- a/src/main/kotlin/com/looker/droidify/ui/viewmodels/MainActivityViewModelX.kt
+++ b/src/main/kotlin/com/looker/droidify/ui/viewmodels/MainActivityViewModelX.kt
@@ -1,9 +1,6 @@
 package com.looker.droidify.ui.viewmodels
 
 import androidx.lifecycle.ViewModel
-import com.looker.droidify.database.CursorOwner
 
 class MainActivityViewModelX : ViewModel() {
-
-    val activeRequests = mutableMapOf<Int, CursorOwner.ActiveRequest>()
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/looker/droidify/utility/Utils.kt b/src/main/kotlin/com/looker/droidify/utility/Utils.kt
index d9fb64a5..330754e9 100644
--- a/src/main/kotlin/com/looker/droidify/utility/Utils.kt
+++ b/src/main/kotlin/com/looker/droidify/utility/Utils.kt
@@ -9,7 +9,6 @@ import android.content.pm.Signature
 import android.content.res.Configuration
 import android.database.Cursor
 import android.graphics.drawable.Drawable
-import android.os.Build
 import androidx.recyclerview.widget.AsyncDifferConfig
 import androidx.recyclerview.widget.DiffUtil
 import com.fasterxml.jackson.core.JsonGenerator
@@ -136,11 +135,7 @@ object Utils {
             setLocalCode = Locale.getDefault().language
         }
         val config = resources.configuration
-        val sysLocale = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            config.locales[0]
-        } else {
-            config.locale
-        }
+        val sysLocale = if (Android.sdk(24)) config.locales[0] else config.locale
         if (setLocalCode != sysLocale.language || setLocalCode != "${sysLocale.language}-r${sysLocale.country}") {
             val newLocale = getLocaleOfCode(setLocalCode)
             Locale.setDefault(newLocale)
@@ -165,7 +160,7 @@ object Utils {
     }
 
     fun Context.getLocaleOfCode(localeCode: String): Locale = when {
-        localeCode.isEmpty() -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+        localeCode.isEmpty() -> if (Android.sdk(24)) {
             resources.configuration.locales[0]
         } else {
             resources.configuration.locale