diff --git a/client/src/main/kotlin/io/provenance/objectstore/gateway/client/ClientConfig.kt b/client/src/main/kotlin/io/provenance/objectstore/gateway/client/ClientConfig.kt
index 54288be..1aa9150 100644
--- a/client/src/main/kotlin/io/provenance/objectstore/gateway/client/ClientConfig.kt
+++ b/client/src/main/kotlin/io/provenance/objectstore/gateway/client/ClientConfig.kt
@@ -1,4 +1,4 @@
-package main.kotlin.io.provenance.objectstore.gateway.client
+package io.provenance.objectstore.gateway.client
 
 import io.grpc.netty.NettyChannelBuilder
 import java.net.URI
diff --git a/client/src/main/kotlin/io/provenance/objectstore/gateway/client/GatewayClient.kt b/client/src/main/kotlin/io/provenance/objectstore/gateway/client/GatewayClient.kt
index 38f7414..cfb0f56 100644
--- a/client/src/main/kotlin/io/provenance/objectstore/gateway/client/GatewayClient.kt
+++ b/client/src/main/kotlin/io/provenance/objectstore/gateway/client/GatewayClient.kt
@@ -1,4 +1,4 @@
-package main.kotlin.io.provenance.objectstore.gateway.client
+package io.provenance.objectstore.gateway.client
 
 import io.grpc.Deadline
 import io.grpc.netty.NettyChannelBuilder
@@ -6,13 +6,11 @@ import io.provenance.objectstore.gateway.GatewayGrpc
 import io.provenance.objectstore.gateway.GatewayOuterClass
 import io.provenance.scope.encryption.crypto.SignerImpl
 import io.provenance.scope.encryption.model.KeyRef
-import io.provenance.scope.sdk.toPublicKeyProto
 import io.provenance.scope.util.toProtoTimestamp
 import java.io.Closeable
 import java.time.Duration
 import java.time.OffsetDateTime
 import java.util.concurrent.TimeUnit
-import kotlin.math.sign
 
 class GatewayClient(val config: ClientConfig): Closeable {
     private val channel = NettyChannelBuilder.forAddress(config.gatewayUri.host, config.gatewayUri.port)
diff --git a/example/src/main/kotlin/CreateAndOnboardScope.kt b/example/src/main/kotlin/CreateAndOnboardScope.kt
index 70d608b..789d86e 100644
--- a/example/src/main/kotlin/CreateAndOnboardScope.kt
+++ b/example/src/main/kotlin/CreateAndOnboardScope.kt
@@ -8,26 +8,21 @@ import cosmos.tx.v1beta1.ServiceOuterClass
 import cosmos.tx.v1beta1.TxOuterClass
 import cosmwasm.wasm.v1.QueryOuterClass
 import cosmwasm.wasm.v1.Tx
-import io.grpc.Channel
-import io.grpc.netty.NettyChannelBuilder
 import io.provenance.client.grpc.BaseReqSigner
 import io.provenance.client.grpc.GasEstimationMethod
 import io.provenance.client.grpc.PbClient
 import io.provenance.client.grpc.Signer
 import io.provenance.client.protobuf.extensions.getBaseAccount
 import io.provenance.client.protobuf.extensions.queryWasm
-import io.provenance.eventstream.stream.infrastructure.ApiClient.Companion.client
 import io.provenance.hdwallet.bip39.MnemonicWords
 import io.provenance.hdwallet.ec.extensions.toJavaECKeyPair
 import io.provenance.hdwallet.ec.extensions.toJavaECPrivateKey
-import io.provenance.hdwallet.ec.extensions.toJavaECPublicKey
 import io.provenance.hdwallet.signer.BCECSigner
 import io.provenance.hdwallet.wallet.Account
 import io.provenance.hdwallet.wallet.Wallet
 import io.provenance.metadata.v1.ContractSpecificationRequest
 import io.provenance.metadata.v1.MsgWriteRecordRequest
 import io.provenance.metadata.v1.MsgWriteScopeRequest
-import io.provenance.metadata.v1.MsgWriteScopeRequestKt
 import io.provenance.metadata.v1.MsgWriteSessionRequest
 import io.provenance.metadata.v1.Party
 import io.provenance.metadata.v1.PartyType
@@ -42,29 +37,21 @@ import io.provenance.metadata.v1.ScopeSpecificationRequest
 import io.provenance.metadata.v1.Session
 import io.provenance.metadata.v1.SessionIdComponents
 import io.provenance.name.v1.QueryResolveRequest
-import io.provenance.objectstore.gateway.GatewayGrpc
-import io.provenance.objectstore.gateway.GatewayOuterClass
 import io.provenance.scope.encryption.model.DirectKeyRef
 import io.provenance.scope.encryption.util.toHex
 import io.provenance.scope.encryption.util.toKeyPair
 import io.provenance.scope.objectstore.client.CachedOsClient
 import io.provenance.scope.objectstore.client.OsClient
-import io.provenance.scope.sdk.toPublicKeyProto
 import io.provenance.scope.util.MetadataAddress
-import io.provenance.scope.util.base64String
 import io.provenance.scope.util.sha256
 import io.provenance.scope.util.toByteString
-import io.provenance.scope.util.toProtoTimestamp
-import main.kotlin.io.provenance.objectstore.gateway.client.ClientConfig
-import main.kotlin.io.provenance.objectstore.gateway.client.GatewayClient
+import io.provenance.objectstore.gateway.client.ClientConfig
+import io.provenance.objectstore.gateway.client.GatewayClient
 import org.bouncycastle.jce.provider.BouncyCastleProvider
 import tech.figure.proto.util.toProtoUUID
 import java.net.URI
 import java.security.Security
-import java.security.Signature
-import java.time.OffsetDateTime
 import java.util.UUID
-import java.util.concurrent.Executors
 
 enum class NetworkType(
     /**