diff --git a/spm/cactus/cactus_main.c b/spm/cactus/cactus_main.c
index 650f06d..7e3f40b 100644
--- a/spm/cactus/cactus_main.c
+++ b/spm/cactus/cactus_main.c
@@ -8,8 +8,8 @@
 #include <errno.h>
 #include <debug.h>
 
+#include <cactus_message_loop.h>
 #include <cactus_platform_def.h>
-#include <cactus_test_cmds.h>
 #include <drivers/arm/pl011.h>
 #include <drivers/console.h>
 #include <lib/aarch64/arch_helpers.h>
@@ -74,8 +74,6 @@
 			break;
 		}
 
-		PRINT_CMD(ffa_ret);
-
 		if (!cactus_handle_cmd(&ffa_ret, &ffa_ret, mb)) {
 			break;
 		}