diff --git a/libethdrivers/src/lwip.c b/libethdrivers/src/lwip.c
index f21d265d6..cb50e4ce3 100644
--- a/libethdrivers/src/lwip.c
+++ b/libethdrivers/src/lwip.c
@@ -58,9 +58,7 @@ static void initialize_free_bufs(lwip_iface_t *iface)
 }
 
 static uintptr_t lwip_allocate_rx_buf(void *iface, size_t buf_size, void **cookie)
-{   
-    ZF_LOGW("lwip.c in libethdrivers/src/plat called lwip_allocate_rx_buf()\n");
-    
+{
     lwip_iface_t *lwip_iface = (lwip_iface_t *)iface;
     if (buf_size > CONFIG_LIB_ETHDRIVER_PREALLOCATED_BUF_SIZE) {
         LOG_ERROR("Requested RX buffer of size %zu which can never be fullfilled by preallocated buffers of size %d", buf_size,
@@ -142,9 +140,6 @@ static void lwip_rx_complete(void *iface, unsigned int num_bufs, void **cookies,
         }
     }
 
-//    PKT_DEBUG(printf("Receiving packet\n"));
-//    PKT_DEBUG(print_packet(COL_RX, p->payload, len));
-
 #if ETH_PAD_SIZE
     pbuf_header(p, ETH_PAD_SIZE); /* reclaim the padding word */
 #endif
@@ -413,8 +408,6 @@ static err_t ethif_init(struct netif *netif)
         return ERR_ARG;
     }
 
-    printf("Does this file, lwip.c, get used\n");
-
     lwip_iface_t *iface = (lwip_iface_t *)netif->state;
     int mtu;
     iface->driver.i_fn.low_level_init(&iface->driver, netif->hwaddr, &mtu);
diff --git a/libethdrivers/src/plat/imx6/imx6.c b/libethdrivers/src/plat/imx6/imx6.c
index e540af1a7..a4fe0b02b 100644
--- a/libethdrivers/src/plat/imx6/imx6.c
+++ b/libethdrivers/src/plat/imx6/imx6.c
@@ -468,7 +468,7 @@ static void handle_irq(struct eth_driver *driver, int irq)
         if (e & NETIRQ_TXF) {
             complete_tx(dev);
         }
-        if (e & NETIRQ_RXF && rx_irq_enabled(driver)) {
+        if (e & NETIRQ_RXF) {
             complete_rx(dev);
             fill_rx_bufs(dev);
         }
@@ -517,14 +517,6 @@ static void raw_poll(struct eth_driver *driver)
     fill_rx_bufs(dev);
 }
 
-static void checksum(unsigned char *buffer, unsigned int len) {
-    unsigned int csum;
-    unsigned char *p;
-    unsigned int i;
-    for (p = buffer, i=len, csum=0; i > 0; csum += *p++, --i);
-    printf("check sum = %zu\n", csum);
-}
-
 static int raw_tx(struct eth_driver *driver, unsigned int num, uintptr_t *phys,
                   unsigned int *len, void *cookie)
 {
diff --git a/libethdrivers/src/plat/imx6/ocotp_ctrl.c b/libethdrivers/src/plat/imx6/ocotp_ctrl.c
index 2d8482734..7a5e2c226 100644
--- a/libethdrivers/src/plat/imx6/ocotp_ctrl.c
+++ b/libethdrivers/src/plat/imx6/ocotp_ctrl.c
@@ -23,7 +23,6 @@
 #define IMX6_OCOTP_SIZE    0x00004000
 
 #elif defined(CONFIG_PLAT_IMX8MQ_EVK) || defined(CONFIG_PLAT_IMX8MM_EVK)
-// from: root/arch/arm/include/asm/arch-imx8m/imx-regs-imx8mm.h
 #define IMX6_OCOTP_PADDR   0x30350000
 #define IMX6_OCOTP_SIZE    0x00010000
 
diff --git a/libethdrivers/src/plat/imx6/uboot/imx8mm_pins.h b/libethdrivers/src/plat/imx6/uboot/imx8mm_pins.h
index 71fc2ab5a..964767e37 100644
--- a/libethdrivers/src/plat/imx6/uboot/imx8mm_pins.h
+++ b/libethdrivers/src/plat/imx6/uboot/imx8mm_pins.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright 2018-2019 NXP
- * Taken from u-boot/arch/arm/include/asm/arch-imx8m/imx8mm_pins.h
+ * Content derived from u-boot/arch/arm/include/asm/arch-imx8m/imx8mm_pins.h
  */
 
 #pragma once
@@ -691,4 +691,4 @@ enum {
 	IMX8MM_PAD_UART4_TXD_UART2_RTS_B                              =  IOMUX_PAD(0x04B8, 0x0250, 1, 0x04F8, 1, 0),
 	IMX8MM_PAD_UART4_TXD_UART2_CTS_B                              =  IOMUX_PAD(0x04B8, 0x0250, 1, 0x0000, 0, 0),
 	IMX8MM_PAD_UART4_TXD_GPIO5_IO29                               =  IOMUX_PAD(0x04B8, 0x0250, 5, 0x0000, 0, 0),
-};
\ No newline at end of file
+};
diff --git a/libethdrivers/src/plat/imx6/uboot/imx_board.c b/libethdrivers/src/plat/imx6/uboot/imx_board.c
index 1b292d8f3..171cf650c 100644
--- a/libethdrivers/src/plat/imx6/uboot/imx_board.c
+++ b/libethdrivers/src/plat/imx6/uboot/imx_board.c
@@ -62,7 +62,7 @@
 #elif defined(CONFIG_PLAT_IMX8MM_EVK)
 #include "imx8mm_pins.h"
 
-#define IOMUXC_PADDR    0x30330000 // from: root/arch/arm/include/asm/arch-imx8m/imx-regs-imx8mm.h
+#define IOMUXC_PADDR    0x30330000
 #define IOMUXC_SIZE     0x10000
 
 #else