diff --git a/cpu_threaded.c b/cpu_threaded.c
index 6f52b8f..1396cce 100644
--- a/cpu_threaded.c
+++ b/cpu_threaded.c
@@ -1955,7 +1955,7 @@ void translate_icache_sync() {
         thumb_decode_imm();                                                   \
         u32 rdreg = (hiop & 7);                                               \
         u32 aoff = (pc & ~2) + (imm*4) + 4;                                   \
-        printf("ROM + same page -> optimize as const load\n");                       \
+        /* ROM + same page -> optimize as const load */                       \
         if (!ram_region && (((aoff + 4) >> 15) == (pc >> 15))) {              \
           u32 value = readaddress32(pc_address_block, (aoff & 0x7FFF));           \
           thumb_load_pc_pool_const(rdreg, value);                             \
@@ -2296,11 +2296,11 @@ void translate_icache_sync() {
     {                                                                         \
       u32 swinum = opcode & 0xFF;                                             \
       if (swinum == 6) {                                                      \
-        cycle_count += 64;   printf("Big under-estimation here\n");                  \
+        cycle_count += 64;   /* Big under-estimation here */                  \
         arm_hle_div(thumb);                                                   \
       }                                                                       \
       else if (swinum == 7) {                                                 \
-        cycle_count += 64;   printf("Big under-estimation here\n");                  \
+        cycle_count += 64;   /* Big under-estimation here */                  \
         arm_hle_div_arm(thumb);                                               \
       }                                                                       \
       else {                                                                  \
@@ -2319,16 +2319,16 @@ void translate_icache_sync() {
     case 0xF0 ... 0xF7:                                                       \
     {                                                                         \
       printf("(low word) BL label\n");                                               \
-      printf("This should possibly generate code if not in conjunction with a BLH  \
-         next, but I don't think anyone will do that.\n");                      \
+      /* This should possibly generate code if not in conjunction with a BLH  \
+         next, but I don't think anyone will do that. */                      \
       break;                                                                  \
     }                                                                         \
                                                                               \
     case 0xF8 ... 0xFF:                                                       \
     {                                                                         \
       printf("(high word) BL label\n");                                              \
-      printf("This might not be preceeding a BL low word (Golden Sun 2), if so     \
-         it must be handled like an indirect branch.\n");                       \
+      /* This might not be preceeding a BL low word (Golden Sun 2), if so     \
+         it must be handled like an indirect branch. */                       \
       if((last_opcode >= 0xF000) && (last_opcode < 0xF800))                   \
       {                                                                       \
         thumb_bl();                                                           \
@@ -2369,7 +2369,7 @@ void translate_icache_sync() {
   u16 flag_status = 0;                                                        \
   switch((opcode >> 8) & 0xFF)                                                \
   {                                                                           \
-    printf("left shift by imm\n");                                                   \
+    /* left shift by imm */                                                   \
     case 0x00 ... 0x07:                                                       \
       thumb_flag_modifies_zn();                                               \
       if(((opcode >> 6) & 0x1F) != 0)                                         \
@@ -2378,22 +2378,22 @@ void translate_icache_sync() {
       }                                                                       \
       break;                                                                  \
                                                                               \
-    printf("right shift by imm\n");                                                  \
+    /* right shift by imm */                                                  \
     case 0x08 ... 0x17:                                                       \
       thumb_flag_modifies_znc();                                              \
       break;                                                                  \
                                                                               \
-    printf("add, subtract\n");                                                       \
+    /* add, subtract */                                                       \
     case 0x18 ... 0x1F:                                                       \
       thumb_flag_modifies_all();                                              \
       break;                                                                  \
                                                                               \
-    printf("mov reg, imm\n");                                                        \
+    /* mov reg, imm */                                                        \
     case 0x20 ... 0x27:                                                       \
       thumb_flag_modifies_zn();                                               \
       break;                                                                  \
                                                                               \
-    printf("cmp reg, imm; add, subtract\n");                                         \
+    /* cmp reg, imm; add, subtract */                                         \
     case 0x28 ... 0x3F:                                                       \
       thumb_flag_modifies_all();                                              \
       break;                                                                  \