diff --git a/spm/cactus/cactus_main.c b/spm/cactus/cactus_main.c
index 19a89f5..be6baa9 100644
--- a/spm/cactus/cactus_main.c
+++ b/spm/cactus/cactus_main.c
@@ -286,22 +286,16 @@
 		goto msg_loop;
 	}
 
-	if (ffa_id == SPM_VM_ID_FIRST) {
-		console_init(CACTUS_PL011_UART_BASE,
-			     CACTUS_PL011_UART_CLK_IN_HZ,
-			     PL011_BAUDRATE);
-
-		set_putc_impl(PL011_AS_STDOUT);
-
-		cactus_print_boot_info(boot_info_header);
-	} else {
-		set_putc_impl(FFA_SVC_SMC_CALL_AS_STDOUT);
-	}
+	set_putc_impl(FFA_SVC_SMC_CALL_AS_STDOUT);
 
 	/* Below string is monitored by CI expect script. */
 	NOTICE("Booting Secure Partition (ID: %x)\n%s\n%s\n",
 		ffa_id, build_message, version_string);
 
+	if (ffa_id == SP_ID(1)) {
+		cactus_print_boot_info(boot_info_header);
+	}
+
 	if (ffa_id == (SPM_VM_ID_FIRST + 2)) {
 		VERBOSE("Mapping RXTX Region\n");
 		CONFIGURE_AND_MAP_MAILBOX(mb, PAGE_SIZE, ret);
diff --git a/spm/cactus/plat/arm/fvp/fdts/cactus.dts b/spm/cactus/plat/arm/fvp/fdts/cactus.dts
index 12d7b84..745501e 100644
--- a/spm/cactus/plat/arm/fvp/fdts/cactus.dts
+++ b/spm/cactus/plat/arm/fvp/fdts/cactus.dts
@@ -100,12 +100,6 @@
 	device-regions {
 		compatible = "arm,ffa-manifest-device-regions";
 
-		uart2 {
-			base-address = <0x00000000 0x1c0b0000>;
-			pages-count = <1>;
-			attributes = <0x3>; /* read-write */
-		};
-
 		smmuv3-testengine {
 			/*
 			 * SMMUv3TestEngine is a DMA IP modeled in the
diff --git a/spm/cactus/plat/arm/fvp/include/sp_platform_def.h b/spm/cactus/plat/arm/fvp/include/sp_platform_def.h
index 0025dce..bb57ce8 100644
--- a/spm/cactus/plat/arm/fvp/include/sp_platform_def.h
+++ b/spm/cactus/plat/arm/fvp/include/sp_platform_def.h
@@ -21,9 +21,6 @@
 #define PLAT_ARM_DEVICE0_BASE		DEVICE0_BASE
 #define PLAT_ARM_DEVICE0_SIZE		DEVICE0_SIZE
 
-#define CACTUS_PL011_UART_BASE		PL011_UART2_BASE
-#define CACTUS_PL011_UART_CLK_IN_HZ	PL011_UART2_CLK_IN_HZ
-
 /* Scratch memory used for SMMUv3 driver testing purposes in Cactus SP */
 #define PLAT_CACTUS_MEMCPY_BASE			ULL(0x7400000)
 #define PLAT_CACTUS_NS_MEMCPY_BASE		ULL(0x90000000)
diff --git a/spm/cactus/plat/arm/tc/fdts/cactus.dts b/spm/cactus/plat/arm/tc/fdts/cactus.dts
index fe450e8..31b9e8e 100644
--- a/spm/cactus/plat/arm/tc/fdts/cactus.dts
+++ b/spm/cactus/plat/arm/tc/fdts/cactus.dts
@@ -70,13 +70,4 @@
 			attributes = <0x3>; /* read-write */
 		};
 	};
-
-	device-regions {
-		compatible = "arm,ffa-manifest-device-regions";
-		uart2 {
-			base-address = <0x00000000 0x7FF80000>;
-			pages-count = <1>;
-			attributes = <0x3>; /* read-write */
-		};
-	};
 };
diff --git a/spm/cactus/plat/arm/tc/include/sp_platform_def.h b/spm/cactus/plat/arm/tc/include/sp_platform_def.h
index c5b548d..b3a3514 100644
--- a/spm/cactus/plat/arm/tc/include/sp_platform_def.h
+++ b/spm/cactus/plat/arm/tc/include/sp_platform_def.h
@@ -21,9 +21,6 @@
 #define PLAT_ARM_DEVICE0_BASE		TC_DEVICE0_BASE
 #define PLAT_ARM_DEVICE0_SIZE		TC_DEVICE0_SIZE
 
-#define CACTUS_PL011_UART_BASE		PL011_UART1_BASE
-#define CACTUS_PL011_UART_CLK_IN_HZ	PL011_UART1_CLK_IN_HZ
-
 /* Scratch memory used for SMMUv3 driver testing purposes in Cactus SP */
 /* SMMUv3 tests are disabled for TC platform */
 #define PLAT_CACTUS_MEMCPY_BASE		ULL(0xfe400000)