diff --git a/fthd_hw.c b/fthd_hw.c
index bfdf638..8d4af55 100644
--- a/fthd_hw.c
+++ b/fthd_hw.c
@@ -693,30 +693,10 @@ int fthd_hw_init(struct fthd_private *dev_priv)
 	fthd_hw_s2_preinit_ddr_controller_soc(dev_priv);
 	fthd_hw_s2_init_ddr_controller_soc(dev_priv);
 
-/*
-	dev_info(&dev_priv->pdev->dev,
-		 "Dumping DDR PHY reg map before shmoo\n");
-
-	for (i = 0; i < DDR_PHY_NUM_REGS; i++) {
-		if (!(i % 3) && i >  0)
-			printk("\n");
-
-		val = FTHD_S2_REG_READ(ddr_phy_reg_map[i]);
-		printk(KERN_CONT "0x%.3x = 0x%.8x\t",
-			 ddr_phy_reg_map[i], val);
-	}
-*/
-
 	ret = fthd_ddr_verify_mem(dev_priv, 0, 1024 * 1024);
 	if (ret) {
 		dev_err(&dev_priv->pdev->dev,
 			"Full memory verification failed! (%d)\n", ret);
-		/*
-		 * Here we should do a shmoo calibration but it's not yet
-		 * fully implemented.
-		 */
-
-		/* fthd_ddr_calibrate(dev_priv); */
 	} else {
 		dev_info(&dev_priv->pdev->dev,
 			 "Full memory verification succeeded! (%d)\n", ret);
diff --git a/fthd_hw.h b/fthd_hw.h
index 6656dcc..eae89b3 100644
--- a/fthd_hw.h
+++ b/fthd_hw.h
@@ -47,7 +47,6 @@ static inline u32 _FTHD_S2_REG_READ(struct fthd_private *dev_priv, u32 offset)
 		return 0;
 	}
 
-	// dev_info(&dev_priv->pdev->dev, "Link IO read at %u\n", offset);
 	return ioread32(dev_priv->s2_io + offset);
 }
 
@@ -60,7 +59,6 @@ static inline void _FTHD_S2_REG_WRITE(struct fthd_private *dev_priv, u32 val,
 		return;
 	}
 
-	// dev_info(&dev_priv->pdev->dev, "S2 IO write at %u\n", offset);
 	iowrite32(val, dev_priv->s2_io + offset);
 	fthd_hw_pci_post(dev_priv);
 }
@@ -73,7 +71,6 @@ static inline u32 _FTHD_S2_MEM_READ(struct fthd_private *dev_priv, u32 offset)
 		return 0;
 	}
 
-	// dev_info(&dev_priv->pdev->dev, "Link IO read at %u\n", offset);
 	return ioread32(dev_priv->s2_mem + offset);
 }
 
@@ -86,7 +83,6 @@ static inline void _FTHD_S2_MEM_WRITE(struct fthd_private *dev_priv, u32 val,
 		return;
 	}
 
-	// dev_info(&dev_priv->pdev->dev, "S2 IO write at %u\n", offset);
 	iowrite32(val, dev_priv->s2_mem + offset);
 }
 
@@ -111,7 +107,6 @@ static inline u32 _FTHD_ISP_REG_READ(struct fthd_private *dev_priv, u32 offset)
 		return 0;
 	}
 
-	// dev_info(&dev_priv->pdev->dev, "ISP IO read at %u\n", offset);
 	return ioread32(dev_priv->isp_io + offset);
 }
 
@@ -124,7 +119,6 @@ static inline void _FTHD_ISP_REG_WRITE(struct fthd_private *dev_priv, u32 val,
 		return;
 	}
 
-	// dev_info(&dev_priv->pdev->dev, "Dev IO write at %u\n", offset);
 	iowrite32(val, dev_priv->isp_io + offset);
 	fthd_hw_pci_post(dev_priv);
 }