diff --git a/dma/dma.c b/dma/dma.c
index 714f8a4..7244a2a 100644
--- a/dma/dma.c
+++ b/dma/dma.c
@@ -39,7 +39,7 @@
 #error "unknown machine!"
 #endif /* MACHINE_FIREBEE */
 
-#define DBG_DMA
+//#define DBG_DMA
 #ifdef DBG_DMA
 #define dbg(format, arg...) do { xprintf("DEBUG: %s(): " format, __FUNCTION__, ##arg); } while (0)
 #else
diff --git a/net/fec.c b/net/fec.c
index 4536849..576c6d6 100644
--- a/net/fec.c
+++ b/net/fec.c
@@ -32,7 +32,7 @@
 #error Unknown machine!
 #endif
 
-#define DBG_FEC
+//#define DBG_FEC
 #ifdef DBG_FEC
 #define dbg(format, arg...) do { xprintf("DEBUG: %s(): " format, __FUNCTION__, ##arg); } while (0)
 #else
diff --git a/sys/interrupts.c b/sys/interrupts.c
index c6f8ca9..6168b30 100644
--- a/sys/interrupts.c
+++ b/sys/interrupts.c
@@ -37,7 +37,7 @@
 #include "dma.h"
 #include "pci.h"
 
-#define IRQ_DEBUG
+//#define IRQ_DEBUG
 #if defined(IRQ_DEBUG)
 #define dbg(format, arg...) do { xprintf("DEBUG %s(): " format, __FUNCTION__, ##arg); } while (0)
 #else
@@ -243,7 +243,7 @@ bool pic_interrupt_handler(void *arg1, void *arg2)
     uint8_t rcv_byte;
 
     rcv_byte = MCF_PSC3_PSCRB_8BIT;
-    if (rcv_byte == 2)  // PIC requests RTC data
+    if (rcv_byte == 2)                  /* PIC requests RTC data */
     {
         uint8_t *rtc_reg = (uint8_t *) 0xffff8961;
         uint8_t *rtc_data = (uint8_t *) 0xffff8963;
@@ -271,21 +271,22 @@ bool xlbpci_interrupt_handler(void *arg1, void *arg2)
 
     if (reason & MCF_PCI_PCIISR_RE)
     {
-        err("Retry error. Retry terminated or max retries reached. Cleared\r\n");
+        dbg("Retry error. Retry terminated or max retries reached. Cleared\r\n");
         MCF_PCI_PCIISR |= MCF_PCI_PCIISR_RE;
     }
 
     if (reason & MCF_PCI_PCIISR_IA)
     {
-        err("Initiator abort. No target answered in time. Cleared.\r\n");
+        dbg("Initiator abort. No target answered in time. Cleared.\r\n");
         MCF_PCI_PCIISR |= MCF_PCI_PCIISR_IA;
     }
 
     if (reason & MCF_PCI_PCIISR_TA)
     {
-        err("Target abort. Cleared.\r\n");
+        dbg("Target abort. Cleared.\r\n");
         MCF_PCI_PCIISR |= MCF_PCI_PCIISR_TA;
     }
+
     return true;
 }
 
@@ -330,7 +331,7 @@ bool irq5_handler(void *arg1, void *arg2)
         pending_interrupts & FBEE_INTR_PCI_INTC ||
         pending_interrupts & FBEE_INTR_PCI_INTD)
     {
-        dbg("PCI interrupt\r\n");
+        dbg("PCI interrupt IRQ5\r\n");
         FBEE_INTR_CLEAR = FBEE_INTR_PCI_INTA |
                           FBEE_INTR_PCI_INTB |
                           FBEE_INTR_PCI_INTC |