diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index f77280639c..e73dae693f 100644
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -206,7 +206,7 @@ INCLUDE FILES: drivers/uart.h
 #define INBYTE(x) inByte(x)
 #define OUTBYTE(x, d) outByte(d, x)
 
-#if defined(VXMICRO_ARCH_Intel)
+#if defined(CONFIG_X86_32)
 #define INT_CONNECT(port, isr, arg, stub)                  \
 	irq_connect((unsigned int)uart[port].irq,    \
 			  (unsigned int)uart[port].intPri, \
@@ -222,7 +222,7 @@ INCLUDE FILES: drivers/uart.h
 				  isr,                              \
 				  arg);                             \
 	} while (0)
-#endif /* VXMICRO_ARCH_Intel */
+#endif /* CONFIG_X86_32 */
 
 struct ns16550 {
 	uint32_t port;    /* base port number or MM base address */
diff --git a/include/arch/cpu.h b/include/arch/cpu.h
index 45316362e8..f379768d46 100644
--- a/include/arch/cpu.h
+++ b/include/arch/cpu.h
@@ -40,7 +40,7 @@
 #elif defined(CONFIG_ARC)
 #include <arch/arc/arch.h>
 #else
-#error "Unknown VXMICRO_ARCH"
+#error "Unknown Architecture"
 #endif
 
 #endif /* __ARCHCPU_H__ */
diff --git a/kernel/nanokernel/nano_init.c b/kernel/nanokernel/nano_init.c
index 0deb244f15..9d80139835 100644
--- a/kernel/nanokernel/nano_init.c
+++ b/kernel/nanokernel/nano_init.c
@@ -191,8 +191,8 @@ extern void *__stack_chk_guard;
 #elif defined(CONFIG_ARM)
 #define _MOVE_INSTR "str "
 #else
-#error "Unknown VXMICRO_ARCH type"
-#endif /* VXMICRO_ARCH */
+#error "Unknown Architecture type"
+#endif /* CONFIG_X86_32 */
 
 #define STACK_CANARY_INIT()                                \
 	do {                                               \
diff --git a/scripts/Makefile.arm.preparch b/scripts/Makefile.arm.preparch
index c3236d3286..9b3cb069b4 100644
--- a/scripts/Makefile.arm.preparch
+++ b/scripts/Makefile.arm.preparch
@@ -7,8 +7,6 @@ endif
 ifeq ($(CONFIG_CPU_CORTEXM4),y)
 arm_FLAGS += -mcpu=cortex-m4 -march=armv7e-m
 endif
-arm_FLAGS += -DCONFIG_ARM
-arm_FLAGS += -DVXMICRO_ARCH=arm
 arm_FLAGS += $(SECTION_GC_FLAG)
 arm_FLAGS += $(LTO_FLAG-$(CONFIG_LTO))
 
diff --git a/scripts/Makefile.x86.preparch b/scripts/Makefile.x86.preparch
index dc5592e3be..01b94908be 100644
--- a/scripts/Makefile.x86.preparch
+++ b/scripts/Makefile.x86.preparch
@@ -10,7 +10,6 @@ ifneq ($(CONFIG_BSP_QUARK),y)
 iSSE_FP_MATH_ ?= -mno-sse
 iSSE_FP_MATH  ?= ${iSSE_FP_MATH_${CONFIG_SSE_FP_MATH}}
 endif
-x86_FLAGS += -DVXMICRO_ARCH=x86
 x86_FLAGS += $(ALIGN_STACK_FLAG)
 x86_FLAGS += $(SECTION_GC_FLAG)
 x86_FLAGS += $(LTO_FLAG)