diff --git a/src/mainboard/emulation/qemu-i440fx/romstage.c b/src/mainboard/emulation/qemu-i440fx/romstage.c
index bc239293d7..1676fb0ec2 100644
--- a/src/mainboard/emulation/qemu-i440fx/romstage.c
+++ b/src/mainboard/emulation/qemu-i440fx/romstage.c
@@ -40,9 +40,6 @@ void * asmlinkage romstage_main(unsigned long bist)
 	/* Halt if there was a built in self test failure */
 	report_bist_failure(bist);
 
-	//print_pci_devices();
-	//dump_pci_devices();
-
 	cbmem_was_initted = !cbmem_recovery(0);
 
 	timestamp_init(timestamp_get());
diff --git a/src/mainboard/emulation/qemu-power8/bootblock.c b/src/mainboard/emulation/qemu-power8/bootblock.c
index d92c16951a..5cfb7c132a 100644
--- a/src/mainboard/emulation/qemu-power8/bootblock.c
+++ b/src/mainboard/emulation/qemu-power8/bootblock.c
@@ -17,8 +17,9 @@
 #include <console/console.h>
 #include <program_loading.h>
 
-// the qemu part of all this is very, very non-hardware like.
-// so it gets its own bootblock.
+/* The qemu part of all this is very, very non-hardware like.
+ * So it gets its own bootblock.
+ */
 void main(void)
 {
 	if (IS_ENABLED(CONFIG_BOOTBLOCK_CONSOLE)) {
diff --git a/src/mainboard/emulation/qemu-power8/mainboard.c b/src/mainboard/emulation/qemu-power8/mainboard.c
index 6413f294e8..70b858e7ca 100644
--- a/src/mainboard/emulation/qemu-power8/mainboard.c
+++ b/src/mainboard/emulation/qemu-power8/mainboard.c
@@ -24,7 +24,7 @@ static void mainboard_enable(device_t dev)
 		die("No dev0; die\n");
 	}
 
-	// Where does RAM live?
+	/* Where does RAM live? */
 	ram_resource(dev, 0, 2048, 32768);
 	cbmem_recovery(0);
 }
diff --git a/src/mainboard/emulation/qemu-q35/acpi_tables.c b/src/mainboard/emulation/qemu-q35/acpi_tables.c
index 07589e1ce1..1b32c02f9b 100644
--- a/src/mainboard/emulation/qemu-q35/acpi_tables.c
+++ b/src/mainboard/emulation/qemu-q35/acpi_tables.c
@@ -204,7 +204,7 @@ unsigned long acpi_fill_mcfg(unsigned long current)
 		return current;
 
 	reg = pci_read_config32(dev, 0x60);
-	if ((reg & 0x07) != 0x01)  // require enabled + 256MB size
+	if ((reg & 0x07) != 0x01)  /* require enabled + 256MB size */
 		return current;
 
 	current += acpi_create_mcfg_mmconfig((acpi_mcfg_mmconfig_t *) current,
diff --git a/src/mainboard/emulation/qemu-q35/romstage.c b/src/mainboard/emulation/qemu-q35/romstage.c
index 1bb51da2f6..870dd07762 100644
--- a/src/mainboard/emulation/qemu-q35/romstage.c
+++ b/src/mainboard/emulation/qemu-q35/romstage.c
@@ -42,9 +42,6 @@ void * asmlinkage romstage_main(unsigned long bist)
 	/* Halt if there was a built in self test failure */
 	report_bist_failure(bist);
 
-	//print_pci_devices();
-	//dump_pci_devices();
-
 	cbmem_was_initted = !cbmem_recovery(0);
 
 	timestamp_init(timestamp_get());