diff --git a/deployments/ts-demo/ts-demo.cmake b/deployments/ts-demo/ts-demo.cmake
index f276ca1..ce57ca2 100644
--- a/deployments/ts-demo/ts-demo.cmake
+++ b/deployments/ts-demo/ts-demo.cmake
@@ -39,7 +39,6 @@
 		"components/common/tlv"
 		"components/service/common/include"
 		"components/service/common/client"
-		"components/service/discovery/client"
 		"components/service/crypto/client/cpp"
 		"components/service/crypto/client/cpp/protocol/packed-c"
 		"protocols/service/crypto/packed-c"
diff --git a/deployments/ts-demo/ts-demo.cpp b/deployments/ts-demo/ts-demo.cpp
index 7ccd7dd..d2ee2c0 100644
--- a/deployments/ts-demo/ts-demo.cpp
+++ b/deployments/ts-demo/ts-demo.cpp
@@ -18,18 +18,17 @@
 
 	service_locator_init();
 
-	crypto_service_context = service_locator_query("sn:trustedfirmware.org:crypto:0", &status);
+	crypto_service_context = service_locator_query("sn:trustedfirmware.org:crypto:0");
 
 	if (crypto_service_context) {
 
-		struct rpc_caller *caller;
-		rpc_session_handle rpc_session_handle;
+		struct rpc_caller_session *session = NULL;
 
-		rpc_session_handle = service_context_open(crypto_service_context, TS_RPC_ENCODING_PACKED_C, &caller);
+		session = service_context_open(crypto_service_context);
 
-		if (rpc_session_handle) {
+		if (session) {
 
-			packedc_crypto_client crypto_client(caller);
+			packedc_crypto_client crypto_client(session);
 
 			status = run_ts_demo(&crypto_client, true);
 
@@ -37,7 +36,7 @@
 				printf("run_ts_demo failed\n");
 			}
 
-			service_context_close(crypto_service_context, rpc_session_handle);
+			service_context_close(crypto_service_context, session);
 		}
 		else {
 			printf("Failed to open rpc session\n");