diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 03b0d05..ace6184 100755
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -47,7 +47,6 @@
 target_include_directories(tfm_ns_interface
     INTERFACE
         ${NS_INTERFACE_DIR}
-        ${NS_INTERFACE_DIR}/ns_client_id
 )
 
 # PSA interface files are generated from a template
@@ -77,12 +76,6 @@
 
 add_library(tfm_api_ns STATIC)
 
-target_sources(tfm_api_ns
-    PRIVATE
-        $<$<BOOL:${TFM_NS_CLIENT_IDENTIFICATION}>:${NS_INTERFACE_DIR}/ns_client_id/tfm_nspm_svc_handler.c>
-        $<$<BOOL:${TFM_NS_CLIENT_IDENTIFICATION}>:${NS_INTERFACE_DIR}/ns_client_id/tfm_nspm_api.c>
-)
-
 if (${TFM_PSA_API})
     target_sources(tfm_api_ns PRIVATE
         $<$<OR:$<BOOL:${FORWARD_PROT_MSG}>,$<BOOL:${TFM_PARTITION_PLATFORM}>>:${INTERFACE_SRC_DIR}/tfm_platform_ipc_api.c>
@@ -139,9 +132,6 @@
     PRIVATE
         $<$<NOT:$<BOOL:${TFM_MULTI_CORE_TOPOLOGY}>>:tfm_s_veneers>
         platform_ns
-        # CMSIS is currently only required to provide the NS client IDs. In
-        # future, this should probably be made more OS agnostic
-        $<$<BOOL:${TFM_NS_CLIENT_IDENTIFICATION}>:CMSIS_5_tfm_ns>
 )
 
 ############################# PSA test integration #############################
diff --git a/app/main_ns.c b/app/main_ns.c
index f4fe3dd..2df4ffd 100644
--- a/app/main_ns.c
+++ b/app/main_ns.c
@@ -7,7 +7,7 @@
 
 #include "tfm_api.h"
 #include "cmsis_os2.h"
-#include "tfm_ns_svc.h"
+#include "cmsis_compiler.h"
 #include "tfm_ns_interface.h"
 #if defined(TEST_FRAMEWORK_NS) || defined(TEST_FRAMEWORK_S)
 #include "tfm_integ_test.h"
@@ -45,25 +45,6 @@
 #endif
 #endif
 
-extern void * const osRtxUserSVC[1+USER_SVC_COUNT];
-       void * const osRtxUserSVC[1+USER_SVC_COUNT] = {
-  (void *)USER_SVC_COUNT,
-
-#define X(SVC_ENUM, SVC_HANDLER) (void*)SVC_HANDLER,
-
-    /* SVC API for Services */
-#ifdef TFM_NS_CLIENT_IDENTIFICATION
-    LIST_SVC_NSPM
-#endif
-
-#undef X
-
-/*
- * (void *)user_function1,
- *  ...
- */
-};
-
 /**
  * \brief List of RTOS thread attributes
  */
diff --git a/app/psa_api_test.c b/app/psa_api_test.c
index 54f47b9..8f9624b 100644
--- a/app/psa_api_test.c
+++ b/app/psa_api_test.c
@@ -1,14 +1,11 @@
 /*
- * Copyright (c) 2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2021, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
  */
 
 #include "psa_api_test.h"
-#ifdef TFM_NS_CLIENT_IDENTIFICATION
-#include "tfm_nspm_api.h"
-#endif /* TFM_NS_CLIENT_IDENTIFICATION */
 #include "tfm_integ_test.h"
 
 /**
@@ -22,10 +19,6 @@
 {
     UNUSED_VARIABLE(arg);
 
-#ifdef TFM_NS_CLIENT_IDENTIFICATION
-    tfm_nspm_register_client_id();
-#endif /* TFM_NS_CLIENT_IDENTIFICATION */
-
     val_entry();
 
     for (;;) {