diff --git a/firmware/AtomBusMon.c b/firmware/AtomBusMon.c
index bb6b65a..694e9b3 100644
--- a/firmware/AtomBusMon.c
+++ b/firmware/AtomBusMon.c
@@ -39,7 +39,6 @@ char *cmdStrings[] = {
   "continue",
   "next",
   "step",
-#if defined(CPU_EMBEDDED)
   "regs",
   "dis",
   "fill",
@@ -55,7 +54,6 @@ char *cmdStrings[] = {
   "test",
   "srec",
   "special",
-#endif
   "reset",
   "trace",
   "blist",
@@ -81,7 +79,6 @@ void (*cmdFuncs[])(char *params) = {
   doCmdContinue,
   doCmdNext,
   doCmdStep,
-#if defined(CPU_EMBEDDED)
   doCmdRegs,
   doCmdDis,
   doCmdFill,
@@ -97,7 +94,6 @@ void (*cmdFuncs[])(char *params) = {
   doCmdTest,
   doCmdSRec,
   doCmdSpecial,
-#endif
   doCmdReset,
   doCmdTrace,
   doCmdList,
@@ -508,7 +504,6 @@ void log_addr_data(int a, int d) {
   log_char(d);
 }
 
-#if defined(CPU_EMBEDDED)
 void loadData(unsigned int data) {
   int i;
   for (i = 0; i <= 7; i++) {
@@ -628,8 +623,6 @@ void genericRead(char *params, unsigned int (*readFunc)()) {
   memAddr++;
 }
 
-#endif
-
 /********************************************************
  * Logging Helpers
  ********************************************************/
@@ -689,13 +682,11 @@ int logDetails() {
     log_addr_data(b_addr, b_data);
   }
   log0("\n");
-#if defined(CPU_EMBEDDED)
   if (mode & B_RDWR_MASK) {
     // It's only safe to do this for brkpts, as it makes memory accesses
     logCycleCount(OFFSET_BW_CNTL, OFFSET_BW_CNTH);
     disMem(i_addr);
   }
-#endif
   return watch;
 }
 
@@ -703,21 +694,13 @@ void logAddr() {
   memAddr = hwRead16(OFFSET_IAL);
   // Update the serial console
   logCycleCount(OFFSET_CNTL, OFFSET_CNTH);
-#if defined(CPU_EMBEDDED)
   //log0("%04X\n", i_addr);
   nextAddr = disMem(memAddr);
-#else
-  log0("%04X\n", memAddr);
-#endif
   return;
 }
 
 void version() {
-#if defined(CPU_EMBEDDED)
   log0("%s In-Circuit Emulator version %s\n", NAME, VERSION);
-#else
-  log0("%s Bus Monitor version %s\n", NAME, VERSION);
-#endif
   log0("Compiled at %s on %s\n",__TIME__,__DATE__);
   log0("%d watches/breakpoints implemented\n",MAXBKPTS);
 }
@@ -871,7 +854,6 @@ void genericBreakpoint(char *params, unsigned int mode) {
  * Test Helpers
  ********************************************************/
 
-#if defined(CPU_EMBEDDED)
 char *testNames[6] = {
   "Fixed",
   "Checkerboard",
@@ -944,7 +926,6 @@ void test(unsigned int start, unsigned int end, int data) {
     log0(": passed\n");
   }
 }
-#endif // CPU_EMBEDDED
 
 int pollForEvents() {
   int cont = 1;
@@ -1029,8 +1010,6 @@ void doCmdReset(char *params) {
   logAddr();
 }
 
-#if defined(CPU_EMBEDDED)
-
 // doCmdRegs is now in regs<cpu>.c
 
 void doCmdDis(char *params) {
@@ -1245,8 +1224,6 @@ void doCmdSpecial(char *params) {
    logSpecial("IRQ", CTRL_PORT & (1 << SPECIAL_0));
 }
 
-#endif // CPU_EMBEDDED
-
 void doCmdTrace(char *params) {
   long i;
   sscanf(params, "%ld", &i);
diff --git a/firmware/AtomBusMon.h b/firmware/AtomBusMon.h
index c6c69a4..7930f8b 100644
--- a/firmware/AtomBusMon.h
+++ b/firmware/AtomBusMon.h
@@ -20,7 +20,6 @@
 unsigned int hwRead8(unsigned int offset);
 unsigned int hwRead16(unsigned int offset);
 
-#if defined(CPU_EMBEDDED)
 unsigned int disMem(unsigned int addr);
 void loadData(unsigned int data);
 void loadAddr(unsigned int addr);
@@ -29,7 +28,6 @@ unsigned int readMemByteInc();
 void writeMemByte();
 void writeMemByteInc();
 unsigned int disMem(unsigned int addr);
-#endif
 
 void doCmdBreak(char *params, unsigned int mode);
 void doCmdBreakI(char *params);
diff --git a/target/common/Makefile_ice6502.inc b/target/common/Makefile_ice6502.inc
index 9b756d6..40dc0b2 100644
--- a/target/common/Makefile_ice6502.inc
+++ b/target/common/Makefile_ice6502.inc
@@ -1,5 +1,5 @@
 # CPU specfic build flags
-CPU_CFLAGS = -DCPU_6502 -DCPU_EMBEDDED
+CPU_CFLAGS = -DCPU_6502
 
 # CPU specfic object files
 CPU_OBJECTS = dis6502.o regs6502.o
diff --git a/target/common/Makefile_ice65c02.inc b/target/common/Makefile_ice65c02.inc
index 6c3a58f..b3ba5c7 100644
--- a/target/common/Makefile_ice65c02.inc
+++ b/target/common/Makefile_ice65c02.inc
@@ -1,5 +1,5 @@
 # CPU specfic build flags
-CPU_CFLAGS = -DCPU_65C02 -DCPU_EMBEDDED
+CPU_CFLAGS = -DCPU_65C02
 
 # CPU specfic object files
 CPU_OBJECTS = dis65c02.o regs6502.o
diff --git a/target/common/Makefile_ice6809.inc b/target/common/Makefile_ice6809.inc
index f21fb63..a0e3f37 100644
--- a/target/common/Makefile_ice6809.inc
+++ b/target/common/Makefile_ice6809.inc
@@ -1,5 +1,5 @@
 # CPU specfic build flags
-CPU_CFLAGS = -DCPU_6809 -DCPU_EMBEDDED
+CPU_CFLAGS = -DCPU_6809
 
 # CPU specfic object files
 CPU_OBJECTS = dis6809.o regs6809.o
diff --git a/target/common/Makefile_icez80.inc b/target/common/Makefile_icez80.inc
index 35c1ab7..d97343b 100644
--- a/target/common/Makefile_icez80.inc
+++ b/target/common/Makefile_icez80.inc
@@ -1,5 +1,5 @@
 # CPU specfic build flags
-CPU_CFLAGS = -DCPU_Z80 -DCPU_EMBEDDED
+CPU_CFLAGS = -DCPU_Z80
 
 # CPU specfic object files
 CPU_OBJECTS = disz80.o regsz80.o