diff --git a/app/src/main/java/org/rfcx/incidents/data/local/guardian/GuardianRegistrationDb.kt b/app/src/main/java/org/rfcx/incidents/data/local/guardian/GuardianRegistrationDb.kt
index 1e97d9a4..767251df 100644
--- a/app/src/main/java/org/rfcx/incidents/data/local/guardian/GuardianRegistrationDb.kt
+++ b/app/src/main/java/org/rfcx/incidents/data/local/guardian/GuardianRegistrationDb.kt
@@ -5,7 +5,6 @@ import io.realm.kotlin.toFlow
 import kotlinx.coroutines.flow.Flow
 import org.rfcx.incidents.entity.guardian.registration.GuardianRegistration
 import org.rfcx.incidents.entity.response.SyncState
-import org.rfcx.incidents.entity.stream.Stream
 
 class GuardianRegistrationDb(private val realm: Realm) {
 
diff --git a/app/src/main/java/org/rfcx/incidents/service/ResponseCleanupWorker.kt b/app/src/main/java/org/rfcx/incidents/service/ResponseCleanupWorker.kt
index 202fd189..77db73ee 100644
--- a/app/src/main/java/org/rfcx/incidents/service/ResponseCleanupWorker.kt
+++ b/app/src/main/java/org/rfcx/incidents/service/ResponseCleanupWorker.kt
@@ -63,7 +63,6 @@ class ResponseCleanupWorker(context: Context, params: WorkerParameters) : Worker
             RegistrationSyncWorker.enqueue()
         }
 
-
         val imageDb = DeploymentImageDb(realm)
         val imageUnsent = imageDb.unsentCount()
         imageDb.unlockSending()
diff --git a/app/src/main/java/org/rfcx/incidents/service/deploy/RegistrationSyncWorker.kt b/app/src/main/java/org/rfcx/incidents/service/deploy/RegistrationSyncWorker.kt
index 2aaf91e6..38d1fb07 100644
--- a/app/src/main/java/org/rfcx/incidents/service/deploy/RegistrationSyncWorker.kt
+++ b/app/src/main/java/org/rfcx/incidents/service/deploy/RegistrationSyncWorker.kt
@@ -27,7 +27,7 @@ class RegistrationSyncWorker(private val context: Context, params: WorkerParamet
         Log.d(TAG, "doWork: found ${unsent.size} unsent")
         var someFailed = false
         unsent.forEach {
-            when(it.env) {
+            when (it.env) {
                 "production" -> {
                     val result = prodService.register(it.toRequest()).execute()
                     if (result.isSuccessful) {
diff --git a/app/src/main/java/org/rfcx/incidents/view/guardian/checklist/GuardianCheckListFragment.kt b/app/src/main/java/org/rfcx/incidents/view/guardian/checklist/GuardianCheckListFragment.kt
index 1e84969a..9d6b406f 100644
--- a/app/src/main/java/org/rfcx/incidents/view/guardian/checklist/GuardianCheckListFragment.kt
+++ b/app/src/main/java/org/rfcx/incidents/view/guardian/checklist/GuardianCheckListFragment.kt
@@ -12,7 +12,6 @@ import kotlinx.coroutines.launch
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.rfcx.incidents.databinding.FragmentGuardianChecklistBinding
 import org.rfcx.incidents.service.deploy.DeploymentSyncWorker
-import org.rfcx.incidents.service.deploy.RegistrationSyncWorker
 import org.rfcx.incidents.view.guardian.GuardianDeploymentEventListener
 import org.rfcx.incidents.view.guardian.GuardianScreen
 
diff --git a/app/src/main/java/org/rfcx/incidents/view/report/create/image/BaseImageFragment.kt b/app/src/main/java/org/rfcx/incidents/view/report/create/image/BaseImageFragment.kt
index ed311da9..07ea4103 100644
--- a/app/src/main/java/org/rfcx/incidents/view/report/create/image/BaseImageFragment.kt
+++ b/app/src/main/java/org/rfcx/incidents/view/report/create/image/BaseImageFragment.kt
@@ -3,17 +3,9 @@ package org.rfcx.incidents.view.report.create.image
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import android.provider.MediaStore
-import android.view.LayoutInflater
-import androidx.core.content.FileProvider
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.opensooq.supernova.gligar.GligarPicker
-import org.rfcx.incidents.databinding.ButtomSheetAttachImageLayoutBinding
 import org.rfcx.incidents.util.CameraPermissions
 import org.rfcx.incidents.util.GalleryPermissions
-import org.rfcx.incidents.util.ImageFileUtils
 import org.rfcx.incidents.util.ImageUtils
-import org.rfcx.incidents.util.ReportUtils
 import org.rfcx.incidents.view.base.BaseFragment
 import java.io.File