diff --git a/app/src/main/java/tech/relaycorp/gateway/background/CogRPC.kt b/app/src/main/java/tech/relaycorp/gateway/background/CogRPC.kt
index 95510929..874a9bf2 100644
--- a/app/src/main/java/tech/relaycorp/gateway/background/CogRPC.kt
+++ b/app/src/main/java/tech/relaycorp/gateway/background/CogRPC.kt
@@ -1,6 +1,5 @@
 package tech.relaycorp.gateway.background
 
-
 object CogRPC {
     const val PORT = 21473
 }
diff --git a/app/src/main/java/tech/relaycorp/gateway/domain/courier/CourierSync.kt b/app/src/main/java/tech/relaycorp/gateway/domain/courier/CourierSync.kt
index 4094064a..c513f2b9 100644
--- a/app/src/main/java/tech/relaycorp/gateway/domain/courier/CourierSync.kt
+++ b/app/src/main/java/tech/relaycorp/gateway/domain/courier/CourierSync.kt
@@ -4,7 +4,6 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import tech.relaycorp.gateway.common.Logging.logger
-import tech.relaycorp.gateway.domain.courier.CargoDelivery
 import java.util.logging.Level
 import javax.inject.Inject
 import kotlin.time.seconds
diff --git a/app/src/main/java/tech/relaycorp/gateway/domain/courier/GenerateCargo.kt b/app/src/main/java/tech/relaycorp/gateway/domain/courier/GenerateCargo.kt
index f435c39b..06e0551b 100644
--- a/app/src/main/java/tech/relaycorp/gateway/domain/courier/GenerateCargo.kt
+++ b/app/src/main/java/tech/relaycorp/gateway/domain/courier/GenerateCargo.kt
@@ -1,6 +1,5 @@
 package tech.relaycorp.gateway.domain.courier
 
-import tech.relaycorp.relaynet.messages.Cargo
 import java.io.InputStream
 import javax.inject.Inject
 
@@ -9,5 +8,4 @@ class GenerateCargo
 
     // TODO: implementation
     suspend fun generate(): Iterable<InputStream> = emptyList()
-
 }
diff --git a/app/src/main/java/tech/relaycorp/gateway/domain/courier/ProcessCargo.kt b/app/src/main/java/tech/relaycorp/gateway/domain/courier/ProcessCargo.kt
index 69ef808c..724505ed 100644
--- a/app/src/main/java/tech/relaycorp/gateway/domain/courier/ProcessCargo.kt
+++ b/app/src/main/java/tech/relaycorp/gateway/domain/courier/ProcessCargo.kt
@@ -7,5 +7,4 @@ class ProcessCargo
 
     // TODO: implement
     suspend fun process() {}
-
 }
diff --git a/app/src/main/java/tech/relaycorp/gateway/ui/common/FlowUtils.kt b/app/src/main/java/tech/relaycorp/gateway/ui/common/FlowUtils.kt
index fb86ea28..c2b8fe9d 100644
--- a/app/src/main/java/tech/relaycorp/gateway/ui/common/FlowUtils.kt
+++ b/app/src/main/java/tech/relaycorp/gateway/ui/common/FlowUtils.kt
@@ -1,2 +1 @@
 package tech.relaycorp.gateway.ui.common
-
diff --git a/app/src/main/java/tech/relaycorp/gateway/ui/main/MainActivity.kt b/app/src/main/java/tech/relaycorp/gateway/ui/main/MainActivity.kt
index c832e74d..1f088ade 100644
--- a/app/src/main/java/tech/relaycorp/gateway/ui/main/MainActivity.kt
+++ b/app/src/main/java/tech/relaycorp/gateway/ui/main/MainActivity.kt
@@ -1,6 +1,5 @@
 package tech.relaycorp.gateway.ui.main
 
-import android.content.Intent
 import android.os.Bundle
 import kotlinx.android.synthetic.main.activity_main.*
 import tech.relaycorp.gateway.R
diff --git a/app/src/main/java/tech/relaycorp/gateway/ui/sync/CourierConnectionViewModel.kt b/app/src/main/java/tech/relaycorp/gateway/ui/sync/CourierConnectionViewModel.kt
index 7afd291b..90c5129f 100644
--- a/app/src/main/java/tech/relaycorp/gateway/ui/sync/CourierConnectionViewModel.kt
+++ b/app/src/main/java/tech/relaycorp/gateway/ui/sync/CourierConnectionViewModel.kt
@@ -1,10 +1,7 @@
 package tech.relaycorp.gateway.ui.sync
 
-import kotlinx.coroutines.channels.sendBlocking
 import tech.relaycorp.gateway.background.CourierConnectionObserver
 import tech.relaycorp.gateway.ui.BaseViewModel
-import tech.relaycorp.gateway.ui.common.Click
-import tech.relaycorp.gateway.ui.main.PublishFlow
 import javax.inject.Inject
 
 class CourierConnectionViewModel
@@ -17,6 +14,5 @@ class CourierConnectionViewModel
     val state get() = connectionObserver.observe()
 
     init {
-
     }
 }
diff --git a/app/src/main/java/tech/relaycorp/gateway/ui/sync/CourierSyncActivity.kt b/app/src/main/java/tech/relaycorp/gateway/ui/sync/CourierSyncActivity.kt
index 6ffc319b..3dced9bc 100644
--- a/app/src/main/java/tech/relaycorp/gateway/ui/sync/CourierSyncActivity.kt
+++ b/app/src/main/java/tech/relaycorp/gateway/ui/sync/CourierSyncActivity.kt
@@ -16,7 +16,6 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import tech.relaycorp.gateway.R
-import tech.relaycorp.gateway.background.CourierConnectionState
 import tech.relaycorp.gateway.domain.courier.CourierSync
 import tech.relaycorp.gateway.ui.BaseActivity
 import javax.inject.Inject