diff --git a/arch/riscv32/core/Makefile b/arch/riscv32/core/Makefile
index 53bf788bbdd..3f8e7ba219a 100644
--- a/arch/riscv32/core/Makefile
+++ b/arch/riscv32/core/Makefile
@@ -1,4 +1,3 @@
-ccflags-y += -I$(srctree)/kernel/unified/include
 ccflags-y +=-I$(srctree)/arch/$(ARCH)/include
 
 obj-y += isr.o reset.o fatal.o irq_manage.o \
diff --git a/arch/x86/core/swap.S b/arch/x86/core/swap.S
index c2a80bf447b..c769720308b 100644
--- a/arch/x86/core/swap.S
+++ b/arch/x86/core/swap.S
@@ -328,8 +328,7 @@ CROHandlingDone:
 	 *
 	 * - the return value for __swap() that was set up by a call to
 	 * _set_thread_return_value()
-	 * - in legacy kernel, same value as %ebx, which is non-volatile
-	 * - in unified kernel, -EINVAL
+	 * - -EINVAL
 	 */
 
 	/* Utilize the 'eflags' parameter to __swap() */
diff --git a/arch/xtensa/core/Makefile b/arch/xtensa/core/Makefile
index df5d485da37..ade6030a04c 100644
--- a/arch/xtensa/core/Makefile
+++ b/arch/xtensa/core/Makefile
@@ -1,5 +1,4 @@
-ccflags-y += -I$(srctree)/kernel/unified/include
-asflags-y += -I$(srctree)/kernel/unified/include -mlongcalls
+asflags-y += -mlongcalls
 
 ifdef CONFIG_ATOMIC_OPERATIONS_C
 # Use C routines from kernel/atomic_c.c
diff --git a/samples/subsys/logging/logger-hook/README.txt b/samples/subsys/logging/logger-hook/README.txt
index d5d94d1c29f..29dbc027a21 100644
--- a/samples/subsys/logging/logger-hook/README.txt
+++ b/samples/subsys/logging/logger-hook/README.txt
@@ -11,8 +11,8 @@ logger output can be sent to a driver such as UART / USIF etc. as well.
 
 Building and Running Project:
 
-This unified project outputs to the console.
-It can be built and executed on QEMU as follows:
+This project outputs to the console.  It can be built and executed on QEMU as
+follows:
 
     make run
 
@@ -33,6 +33,6 @@ or
 
 Sample Output:
 
-[sample-unified] [ERR] main: SYS LOG ERR is ACTIVE
-[sample-unified] [WRN] main: SYS LOG WRN is ACTIVE
-[sample-unified] [INF] main: SYS LOG INF is ACTIVE
+[syslogger] [ERR] main: SYS LOG ERR is ACTIVE
+[syslogger] [WRN] main: SYS LOG WRN is ACTIVE
+[syslogger] [INF] main: SYS LOG INF is ACTIVE
diff --git a/samples/subsys/logging/logger-hook/sample.tc b/samples/subsys/logging/logger-hook/sample.tc
index 8d64e46f84a..142c08b5002 100644
--- a/samples/subsys/logging/logger-hook/sample.tc
+++ b/samples/subsys/logging/logger-hook/sample.tc
@@ -2,6 +2,6 @@
 # @targets \
 # board:(?!qemu_nios2)
 #
-# @eval console-rx %(console)s:5 \[sample-unified\] \[ERR\] main: SYS LOG ERR is ACTIVE
-# @eval console-rx %(console)s:5 \[sample-unified\] \[WRN\] main: SYS LOG WRN is ACTIVE
-# @eval console-rx %(console)s:5 \[sample-unified\] \[INF\] main: SYS LOG INF is ACTIVE
+# @eval console-rx %(console)s:5 \[syslogger\] \[ERR\] main: SYS LOG ERR is ACTIVE
+# @eval console-rx %(console)s:5 \[syslogger\] \[WRN\] main: SYS LOG WRN is ACTIVE
+# @eval console-rx %(console)s:5 \[syslogger\] \[INF\] main: SYS LOG INF is ACTIVE
diff --git a/samples/subsys/logging/logger-hook/src/main.c b/samples/subsys/logging/logger-hook/src/main.c
index d4fccf1fe77..58baf760187 100644
--- a/samples/subsys/logging/logger-hook/src/main.c
+++ b/samples/subsys/logging/logger-hook/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define SYS_LOG_DOMAIN "sample-unified"
+#define SYS_LOG_DOMAIN "syslogger"
 
 #include <zephyr.h>
 #include <misc/printk.h>
@@ -17,7 +17,6 @@
 /**
  * @file
  * @brief using logger hook demo
- * unified version of logger hook usage demo
  */
 
 u32_t logger_buffer[LOG_BUF_SIZE];
diff --git a/scripts/sanity_chk/sanity_unified.args b/scripts/sanity_chk/sanity_unified.args
deleted file mode 100644
index cd79b0fd926..00000000000
--- a/scripts/sanity_chk/sanity_unified.args
+++ /dev/null
@@ -1,16 +0,0 @@
---platform
-qemu_cortex_m3
---platform
-qemu_x86
---platform
-qemu_x86_iamcu
---platform
-qemu_nios2
---tag
-unified_capable
--x
-KERNEL_TYPE=unified
--O
-unified
--o
-unified.cvs