diff --git a/include/common/debug.h b/include/common/debug.h
index 216c53d..53eebf7 100644
--- a/include/common/debug.h
+++ b/include/common/debug.h
@@ -66,23 +66,13 @@
 #endif
 
 /*
- * For the moment this Panic function is very basic, Report an error and
+ * For the moment this panic function is very basic: report an error and
  * spin. This can be expanded in the future to provide more information.
  */
-#if DEBUG
 void __attribute__((__noreturn__)) do_panic(const char *file, int line);
 #define panic()	do_panic(__FILE__, __LINE__)
 
 void __attribute__((__noreturn__)) do_bug_unreachable(const char *file, int line);
 #define bug_unreachable() do_bug_unreachable(__FILE__, __LINE__)
 
-#else
-void __attribute__((__noreturn__)) do_panic(void);
-#define panic()	do_panic()
-
-void __attribute__((__noreturn__)) do_bug_unreachable(void);
-#define bug_unreachable()	do_bug_unreachable()
-
-#endif
-
 #endif /* __DEBUG_H__ */
diff --git a/tftf/framework/debug.c b/tftf/framework/debug.c
index 4b4364d..0927ed4 100644
--- a/tftf/framework/debug.c
+++ b/tftf/framework/debug.c
@@ -7,7 +7,6 @@
 #include <console.h>
 #include <debug.h>
 
-#if DEBUG
 void __attribute__((__noreturn__)) do_panic(const char *file, int line)
 {
 	printf("PANIC in file: %s line: %d\n", file, line);
@@ -23,21 +22,3 @@
 	mp_printf("BUG: Unreachable code!\n");
 	do_panic(file, line);
 }
-
-#else
-void __attribute__((__noreturn__)) do_panic(void)
-{
-	printf("PANIC\n");
-
-	console_flush();
-
-	while (1)
-		continue;
-}
-
-void __attribute__((__noreturn__)) do_bug_unreachable(void)
-{
-	mp_printf("BUG: Unreachable code!\n");
-	do_panic();
-}
-#endif