diff --git a/tools/config/__init__.py b/tools/config/__init__.py
index ce127aa429..9cc2056b2c 100755
--- a/tools/config/__init__.py
+++ b/tools/config/__init__.py
@@ -707,14 +707,6 @@ class Config(object):
             )
         if hasattr(self.target, "mbed_{}_size".format(memory_type)):
             mem_size = getattr(self.target, "mbed_{}_size".format(memory_type))
-        if self.target.is_PSA_non_secure_target:
-            config, _ = self.get_config_data()
-            mem_start = config.get(
-                "target.non-secure-{}-start".format(memory_type), mem_start
-            ).value
-            mem_size = config.get(
-                "target.non-secure-{}-size".format(memory_type), mem_size
-            ).value
         if mem_start and not isinstance(mem_start, int):
             mem_start = int(mem_start, 0)
         if mem_size and not isinstance(mem_size, int):
diff --git a/tools/targets/PSOC6.py b/tools/targets/PSOC6.py
index 8d2a4a72b2..b906937ccc 100644
--- a/tools/targets/PSOC6.py
+++ b/tools/targets/PSOC6.py
@@ -1,6 +1,7 @@
 #
 # Copyright (c) 2017-2018 Future Electronics
 # Copyright (c) 2018-2019 Cypress Semiconductor Corporation
+# Copyright (c) 2020 Arm Limited
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -134,8 +135,6 @@ def find_cm0_image(toolchain, resources, elf, hexf, hex_filename):
     from tools.resources import FileType
     hex_files = resources.get_file_paths(FileType.HEX)
     m0hexf = next((f for f in hex_files if os.path.basename(f) == hex_filename), None)
-    if toolchain.target.is_PSA_non_secure_target:
-        m0hexf = next((f for f in hex_files if os.path.basename(f) == os.path.basename(hexf)), m0hexf)
 
     if m0hexf:
         toolchain.notify.info("M0 core image file found: %s." % m0hexf)
diff --git a/tools/targets/__init__.py b/tools/targets/__init__.py
index d11087f738..9bb5467f6b 100644
--- a/tools/targets/__init__.py
+++ b/tools/targets/__init__.py
@@ -401,10 +401,6 @@ class Target(namedtuple(
     def is_TrustZone_target(self):
         return self.is_TrustZone_non_secure_target
 
-    @property
-    def is_PSA_non_secure_target(self):
-        return 'NSPE_Target' in self.labels
-
     @property
     def is_PSA_target(self):
         return 'PSA' in self.features