diff --git a/moshi/src/main/java/com/squareup/moshi/JsonValueWriter.kt b/moshi/src/main/java/com/squareup/moshi/JsonValueWriter.kt
index 8de3921..e06051a 100644
--- a/moshi/src/main/java/com/squareup/moshi/JsonValueWriter.kt
+++ b/moshi/src/main/java/com/squareup/moshi/JsonValueWriter.kt
@@ -30,7 +30,6 @@ import java.math.BigDecimal
 
 /** Writes JSON by building a Java object comprising maps, lists, and JSON primitives. */
 internal class JsonValueWriter : JsonWriter() {
-  @JvmField // TODO remove once JsonWriter is Kotlin
   var stack = arrayOfNulls<Any>(32)
   private var deferredName: String? = null
 
diff --git a/moshi/src/main/java/com/squareup/moshi/Moshi.kt b/moshi/src/main/java/com/squareup/moshi/Moshi.kt
index 66a69bc..393deed 100644
--- a/moshi/src/main/java/com/squareup/moshi/Moshi.kt
+++ b/moshi/src/main/java/com/squareup/moshi/Moshi.kt
@@ -352,7 +352,6 @@ public class Moshi internal constructor(builder: Builder) {
 
     override fun fromJson(reader: JsonReader) = withAdapter { fromJson(reader) }
 
-    @Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS") // TODO remove after JsonAdapter is migrated
     override fun toJson(writer: JsonWriter, value: T?) = withAdapter { toJson(writer, value) }
 
     private inline fun <R> withAdapter(body: JsonAdapter<T>.() -> R): R =