diff --git a/build.gradle.kts b/build.gradle.kts
index c81ca6b..a8d1a05 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,8 +2,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.apache.tools.ant.taskdefs.condition.Os
 
 plugins {
-  kotlin("jvm") version "1.4.30"
-  kotlin("kapt") version "1.4.30"
+  kotlin("jvm") version "1.4.31"
+  kotlin("kapt") version "1.4.31"
   `maven-publish`
   application
   id("net.nemerosa.versioning") version "2.13.1"
@@ -118,8 +118,6 @@ dependencies {
   implementation("io.ktor:ktor-client-okhttp:1.5.0")
   implementation("io.ktor:ktor-client-core-jvm:1.5.0")
 
-  implementation("io.rsocket:rsocket-core:1.1.0")
-
   // define a BOM and its version
   implementation(platform("com.squareup.okhttp3:okhttp-bom:4.10.0-RC1"))
 
@@ -127,8 +125,8 @@ dependencies {
   implementation("com.squareup.okhttp3:okhttp")
   implementation("com.squareup.okio:okio:3.0.0-alpha.1")
   implementation("info.picocli:picocli:4.5.2")
-  implementation("org.jetbrains.kotlin:kotlin-reflect:1.4.30")
-  implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.30")
+  implementation("org.jetbrains.kotlin:kotlin-reflect:1.4.31")
+  implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.31")
   implementation("com.squareup.moshi:moshi:1.11.0")
   implementation("com.squareup.moshi:moshi-adapters:1.11.0")
   implementation("com.squareup.moshi:moshi-kotlin:1.11.0")
@@ -144,8 +142,8 @@ dependencies {
   }
 
   testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0")
-  testImplementation("org.jetbrains.kotlin:kotlin-test:1.4.30")
-  testImplementation("org.jetbrains.kotlin:kotlin-test-junit:1.4.30")
+  testImplementation("org.jetbrains.kotlin:kotlin-test:1.4.31")
+  testImplementation("org.jetbrains.kotlin:kotlin-test-junit:1.4.31")
 
   testRuntime("org.junit.jupiter:junit-jupiter-engine:5.7.0")
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 25d3265..8cf6eb5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/kotlin/io/rsocket/cli/Main.kt b/src/main/kotlin/io/rsocket/cli/Main.kt
index 8f17cd7..ac45b5f 100644
--- a/src/main/kotlin/io/rsocket/cli/Main.kt
+++ b/src/main/kotlin/io/rsocket/cli/Main.kt
@@ -13,12 +13,13 @@
  */
 package io.rsocket.cli
 
-import com.baulsupp.oksocial.output.*
-import io.ktor.util.KtorExperimentalAPI
+import com.baulsupp.oksocial.output.ConsoleHandler
+import com.baulsupp.oksocial.output.SimpleResponse
+import com.baulsupp.oksocial.output.SimpleResponseExtractor
+import com.baulsupp.oksocial.output.UsageException
 import io.ktor.utils.io.core.ByteReadPacket
 import io.ktor.utils.io.core.readByteBuffer
 import io.ktor.utils.io.core.readBytes
-import io.rsocket.exceptions.ApplicationErrorException
 import io.rsocket.kotlin.ExperimentalMetadataApi
 import io.rsocket.kotlin.RSocket
 import io.rsocket.kotlin.RSocketError
@@ -49,6 +50,10 @@ import java.nio.charset.StandardCharsets
 import java.util.concurrent.TimeUnit
 import java.util.function.Supplier
 import kotlin.system.exitProcess
+import kotlin.text.isEmpty
+import kotlin.text.startsWith
+import kotlin.text.substring
+import kotlin.text.toByteArray
 import kotlin.time.ExperimentalTime
 import kotlin.time.seconds
 
@@ -57,7 +62,6 @@ import kotlin.time.seconds
  *
  * Currently limited in features, only supports a text/line based approach.
  */
-@KtorExperimentalAPI
 @OptIn(ExperimentalFileSystem::class)
 @Command(description = ["RSocket CLI command"],
   name = "rsocket-cli", mixinStandardHelpOptions = true, version = ["dev"])
@@ -169,7 +173,6 @@ class Main : Runnable {
   }
 
   @OptIn(ExperimentalTime::class)
-  @KtorExperimentalAPI
   private suspend fun buildRSocket(
     uri: String,
     setupPayload: Payload
@@ -233,7 +236,6 @@ class Main : Runnable {
   @OptIn(ExperimentalMetadataApi::class)
   suspend fun buildMetadata(): ByteArray? = when {
     this.route != null -> {
-      // TODO cleanup
       CompositeMetadata(RoutingMetadata(route!!)).toPacket().readBytes()
     }
     this.metadata != null -> {
diff --git a/src/test/kotlin/io/rsocket/RunMain.kt b/src/test/kotlin/io/rsocket/RunMain.kt
index 6fd3465..02525c2 100644
--- a/src/test/kotlin/io/rsocket/RunMain.kt
+++ b/src/test/kotlin/io/rsocket/RunMain.kt
@@ -3,5 +3,5 @@ package io.rsocket
 import io.rsocket.cli.Main
 
 fun main() {
-  Main.main("--route", "searchTweets", "-i", "michigan", "wss://rsocket-demo.herokuapp.com/rsocket")
+  Main.main("--route", "searchTweets", "-i", "london", "wss://demo.rsocket.io/rsocket")
 }