diff --git a/Components/6526/6526.hpp b/Components/6526/6526.hpp
index c70e5ba18..751d91616 100644
--- a/Components/6526/6526.hpp
+++ b/Components/6526/6526.hpp
@@ -12,7 +12,6 @@
 
 #include "Implementation/6526Storage.hpp"
 #include "../Serial/Line.hpp"
-#include "../../Outputs/Log.hpp"
 
 namespace MOS::MOS6526 {
 
diff --git a/Components/6526/Implementation/6526Storage.hpp b/Components/6526/Implementation/6526Storage.hpp
index 0c3695eab..35db218aa 100644
--- a/Components/6526/Implementation/6526Storage.hpp
+++ b/Components/6526/Implementation/6526Storage.hpp
@@ -11,6 +11,7 @@
 #include <array>
 
 #include "../../../ClockReceiver/ClockReceiver.hpp"
+#include "../../../Outputs/Log.hpp"
 
 namespace MOS::MOS6526 {
 
@@ -220,7 +221,8 @@ struct MOS6526Storage {
 			control = v;
 
 			if(v&2) {
-				printf("UNIMPLEMENTED: PB strobe\n");
+				Log::Logger<Log::Source::MOS6526> log;
+				log.error().append("UNIMPLEMENTED: PB strobe");
 			}
 		}
 
diff --git a/Components/DiskII/IWM.cpp b/Components/DiskII/IWM.cpp
index 57cb5a798..8a047eb03 100644
--- a/Components/DiskII/IWM.cpp
+++ b/Components/DiskII/IWM.cpp
@@ -55,10 +55,6 @@ uint8_t IWM::read(int address) {
 			logger.info().append("Invalid read\n");
 		return 0xff;
 
-		// "Read all 1s".
-//			printf("Reading all 1s\n");
-//		return 0xff;
-
 		case 0:
 		case ENABLE: {				/* Read data register. Zeroing afterwards is a guess. */
 			const auto result = data_register_;
diff --git a/Components/DiskII/MacintoshDoubleDensityDrive.cpp b/Components/DiskII/MacintoshDoubleDensityDrive.cpp
index 164d3ebe0..d90784b76 100644
--- a/Components/DiskII/MacintoshDoubleDensityDrive.cpp
+++ b/Components/DiskII/MacintoshDoubleDensityDrive.cpp
@@ -30,7 +30,6 @@ DoubleDensityDrive::DoubleDensityDrive(int input_clock_rate, bool is_800k) :
 // MARK: - Speed Selection
 
 void DoubleDensityDrive::did_step(Storage::Disk::HeadPosition to_position) {
-//	printf("At track %d\n", to_position.as_int());
 	// The 800kb drive automatically selects rotation speed as a function of
 	// head position; the 400kb drive doesn't do so.
 	if(is_800k_) {
diff --git a/Machines/Atari/ST/DMAController.cpp b/Machines/Atari/ST/DMAController.cpp
index 7c416aa25..f7c551fb8 100644
--- a/Machines/Atari/ST/DMAController.cpp
+++ b/Machines/Atari/ST/DMAController.cpp
@@ -16,7 +16,7 @@ using namespace Atari::ST;
 
 namespace {
 
-Log::Logger<Log::Source::AtariSTDMAController> logger;
+[[maybe_unused]] Log::Logger<Log::Source::AtariSTDMAController> logger;
 
 enum Control: uint16_t {
 	Direction = 0x100,
diff --git a/Machines/Oric/BD500.cpp b/Machines/Oric/BD500.cpp
index 7daf3ab57..eb8ffd115 100644
--- a/Machines/Oric/BD500.cpp
+++ b/Machines/Oric/BD500.cpp
@@ -28,7 +28,6 @@ void BD500::write(int address, uint8_t value) {
 	access(address);
 
 	if(address >= 0x0320 && address <= 0x0323) {
-//		if(address == 0x320) printf("Command %02x\n", value);
 		WD::WD1770::write(address, value);
 	}
 
@@ -69,9 +68,7 @@ void BD500::access(int address) {
 		case 0x314:	enable_overlay_ram_ = true;		break;
 		case 0x317:	disable_basic_rom_ = false;		break;
 
-		default:
-//			printf("Switch %04x???\n", address);
-		break;
+		default: break;
 	}
 
 	select_paged_item();