diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index a2af24b6..a499eb18 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -8,6 +8,8 @@
           <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
         </value>
       </option>
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
diff --git a/.run/_sdkLib_connectedCheck.run.xml b/.run/_sdkLib_connectedCheck.run.xml
index 64acdb46..44b8b56d 100644
--- a/.run/_sdkLib_connectedCheck.run.xml
+++ b/.run/_sdkLib_connectedCheck.run.xml
@@ -16,7 +16,6 @@
     <option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
     <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
     <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="2147483645" />
-    <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="locale-debug-48db7" />
     <option name="DEBUGGER_TYPE" value="Auto" />
     <Auto>
       <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
diff --git a/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/MultiRecipientIntegrationTest.kt b/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/MultiRecipientIntegrationTest.kt
index 2fd22556..867e1763 100644
--- a/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/MultiRecipientIntegrationTest.kt
+++ b/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/MultiRecipientIntegrationTest.kt
@@ -7,7 +7,7 @@ package cash.z.ecc.android.sdk.darkside // package cash.z.ecc.android.sdk.integr
 // import cash.z.ecc.android.sdk.darkside.test.DarksideTestCoordinator
 // import cash.z.ecc.android.sdk.util.SimpleMnemonics
 // import cash.z.wallet.sdk.internal.rpc.CompactFormats
-// import cash.z.wallet.sdk.intenral.rpc.Service
+// import cash.z.wallet.sdk.internal.rpc.Service
 // import io.grpc.*
 // import kotlinx.coroutines.delay
 // import kotlinx.coroutines.runBlocking
diff --git a/lightwallet-client-lib/lint.xml b/lightwallet-client-lib/lint.xml
index 9b1f16ad..791d4c8c 100644
--- a/lightwallet-client-lib/lint.xml
+++ b/lightwallet-client-lib/lint.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lint>
-    <!-- Generated by `./gradlew refreshVersions` to avoid errors when using _ as a version. -->
-    <issue id="GradlePluginVersion" severity="ignore" />
-    <issue id="GradleDependency" severity="ignore" />
+
 </lint>
\ No newline at end of file
diff --git a/lightwallet-client-lib/src/main/java/co/electriccoin/lightwallet/client/BlockingLightWalletClient.kt b/lightwallet-client-lib/src/main/java/co/electriccoin/lightwallet/client/BlockingLightWalletClient.kt
index bfe638eb..16062b71 100644
--- a/lightwallet-client-lib/src/main/java/co/electriccoin/lightwallet/client/BlockingLightWalletClient.kt
+++ b/lightwallet-client-lib/src/main/java/co/electriccoin/lightwallet/client/BlockingLightWalletClient.kt
@@ -12,6 +12,9 @@ import co.electriccoin.lightwallet.client.model.RawTransactionUnsafe
 import co.electriccoin.lightwallet.client.model.Response
 import co.electriccoin.lightwallet.client.model.SendResponseUnsafe
 
+// TODO [895]: Let remaining server calls adopt new response result
+// TODO [895]: https://github.com/zcash/zcash-android-wallet-sdk/issues/895
+
 /**
  * Client for interacting with lightwalletd.
  */
diff --git a/lightwallet-client-lib/src/main/java/co/electriccoin/lightwallet/client/CoroutineLightWalletClient.kt b/lightwallet-client-lib/src/main/java/co/electriccoin/lightwallet/client/CoroutineLightWalletClient.kt
index 186e947d..be1827dd 100644
--- a/lightwallet-client-lib/src/main/java/co/electriccoin/lightwallet/client/CoroutineLightWalletClient.kt
+++ b/lightwallet-client-lib/src/main/java/co/electriccoin/lightwallet/client/CoroutineLightWalletClient.kt
@@ -13,6 +13,9 @@ import co.electriccoin.lightwallet.client.model.Response
 import co.electriccoin.lightwallet.client.model.SendResponseUnsafe
 import kotlinx.coroutines.flow.Flow
 
+// TODO [895]: Let remaining server calls adopt new response result
+// TODO [895]: https://github.com/zcash/zcash-android-wallet-sdk/issues/895
+
 /**
  * Client for interacting with lightwalletd.
  */
diff --git a/lightwallet-client-lib/src/main/java/co/electriccoin/lightwallet/client/ApiStatusResolver.kt b/lightwallet-client-lib/src/main/java/co/electriccoin/lightwallet/client/internal/ApiStatusResolver.kt
similarity index 84%
rename from lightwallet-client-lib/src/main/java/co/electriccoin/lightwallet/client/ApiStatusResolver.kt
rename to lightwallet-client-lib/src/main/java/co/electriccoin/lightwallet/client/internal/ApiStatusResolver.kt
index 641b13ed..503cc077 100644
--- a/lightwallet-client-lib/src/main/java/co/electriccoin/lightwallet/client/ApiStatusResolver.kt
+++ b/lightwallet-client-lib/src/main/java/co/electriccoin/lightwallet/client/internal/ApiStatusResolver.kt
@@ -1,4 +1,4 @@
-package co.electriccoin.lightwallet.client
+package co.electriccoin.lightwallet.client.internal
 
 import co.electriccoin.lightwallet.client.model.Response
 
diff --git a/lightwallet-client-lib/src/main/java/co/electriccoin/lightwallet/client/internal/GrpcStatusResolver.kt b/lightwallet-client-lib/src/main/java/co/electriccoin/lightwallet/client/internal/GrpcStatusResolver.kt
index c05d3bfa..0b0229c2 100644
--- a/lightwallet-client-lib/src/main/java/co/electriccoin/lightwallet/client/internal/GrpcStatusResolver.kt
+++ b/lightwallet-client-lib/src/main/java/co/electriccoin/lightwallet/client/internal/GrpcStatusResolver.kt
@@ -1,7 +1,6 @@
 package co.electriccoin.lightwallet.client.internal
 
 import android.util.Log
-import co.electriccoin.lightwallet.client.ApiStatusResolver
 import co.electriccoin.lightwallet.client.model.Response
 import io.grpc.Status
 
diff --git a/sdk-lib/lint.xml b/sdk-lib/lint.xml
index 9b1f16ad..791d4c8c 100644
--- a/sdk-lib/lint.xml
+++ b/sdk-lib/lint.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lint>
-    <!-- Generated by `./gradlew refreshVersions` to avoid errors when using _ as a version. -->
-    <issue id="GradlePluginVersion" severity="ignore" />
-    <issue id="GradleDependency" severity="ignore" />
+
 </lint>
\ No newline at end of file