diff --git a/Makefile.inc b/Makefile.inc
index ad8f1eb744..e71bb6993c 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -132,7 +132,7 @@ help:
 %:
 	$(Q)$(call zephyrmake,$(O),$@)
 
-KERNEL_CONFIG = $(ZEPHYR_BASE)/kernel/configs/unified.config
+KERNEL_CONFIG = $(ZEPHYR_BASE)/kernel/configs/kernel.config
 
 $(DOTCONFIG): $(BOARDCONFIG) $(KBUILD_DEFCONFIG_PATH) $(CONF_FILE)
 	$(Q)$(CONFIG_SHELL) $(ZEPHYR_BASE)/scripts/kconfig/merge_config.sh \
diff --git a/kernel/Kconfig b/kernel/Kconfig
index 81504375d5..5fa848ba52 100644
--- a/kernel/Kconfig
+++ b/kernel/Kconfig
@@ -16,17 +16,6 @@
 # limitations under the License.
 #
 
-choice
-prompt "Kernel Type"
-default MICROKERNEL
-
-config NANOKERNEL
-	bool "Nano Kernel"
-
-config MICROKERNEL
-	bool "Micro Kernel"
-
-endchoice
 
 menu "General Kernel Options"
 
@@ -188,7 +177,7 @@ config KERNEL_EVENT_LOGGER_SLEEP
 	bool
 	prompt "Sleep event logging point"
 	default n
-	depends on KERNEL_EVENT_LOGGER && ((MICROKERNEL && SYS_POWER_MANAGEMENT) || NANOKERNEL)
+	depends on KERNEL_EVENT_LOGGER && SYS_POWER_MANAGEMENT
 	help
 	Enable low power condition event messages. These messages provide the
 	following information:
@@ -241,7 +230,7 @@ config SYS_POWER_LOW_POWER_STATE
 	bool
 	prompt "Low power state"
 	default n
-	depends on MICROKERNEL && SYS_POWER_MANAGEMENT && SYS_POWER_LOW_POWER_STATE_SUPPORTED
+	depends on SYS_POWER_MANAGEMENT && SYS_POWER_LOW_POWER_STATE_SUPPORTED
 	help
 	This option enables the kernel to interface with a power manager
 	application.  This permits the system to enter a custom CPU low power
@@ -253,7 +242,7 @@ config SYS_POWER_DEEP_SLEEP
 	bool
 	prompt "Deep sleep state"
 	default n
-	depends on MICROKERNEL && SYS_POWER_MANAGEMENT && SYS_POWER_DEEP_SLEEP_SUPPORTED
+	depends on SYS_POWER_MANAGEMENT && SYS_POWER_DEEP_SLEEP_SUPPORTED
 	help
 	This option enables the kernel to interface with a power manager
 	application. This permits the system to enter a Deep sleep state
@@ -267,7 +256,7 @@ config DEVICE_POWER_MANAGEMENT
 	bool
 	prompt "Device power management"
 	default n
-	depends on MICROKERNEL && SYS_POWER_MANAGEMENT
+	depends on SYS_POWER_MANAGEMENT
 	help
 	This option enables the device power management interface.  The
 	interface consists of hook functions implemented by device drivers
diff --git a/kernel/configs/kernel.config b/kernel/configs/kernel.config
new file mode 100644
index 0000000000..aff849a3ae
--- /dev/null
+++ b/kernel/configs/kernel.config
@@ -0,0 +1 @@
+# empty for now, use this file for global kernel configurations and overrides.
diff --git a/kernel/configs/unified.config b/kernel/configs/unified.config
deleted file mode 100644
index 895320985f..0000000000
--- a/kernel/configs/unified.config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MICROKERNEL=y
diff --git a/samples/legacy/task_profiler/microkernel/src/hello.c b/samples/legacy/task_profiler/microkernel/src/hello.c
index 211aadf0e4..4e4d6dc975 100644
--- a/samples/legacy/task_profiler/microkernel/src/hello.c
+++ b/samples/legacy/task_profiler/microkernel/src/hello.c
@@ -19,8 +19,6 @@
 #include <zephyr.h>
 #include <stdio.h>
 
-#ifdef CONFIG_MICROKERNEL
-
 /*
  * Microkernel version of hello world demo has two tasks that utilize
  * semaphores and sleeps to take turns printing a greeting message at
@@ -90,5 +88,3 @@ void taskB(void)
 	helloLoop(__func__, TASKBSEM, TASKASEM);
 }
 
-
-#endif /* CONFIG_MICROKERNEL */
diff --git a/samples/legacy/task_profiler/nanokernel/src/hello.c b/samples/legacy/task_profiler/nanokernel/src/hello.c
index 5940d75f25..f36aa9a8e2 100644
--- a/samples/legacy/task_profiler/nanokernel/src/hello.c
+++ b/samples/legacy/task_profiler/nanokernel/src/hello.c
@@ -20,8 +20,6 @@
 #include <stdio.h>
 #include "profiler.h"
 
-#ifdef CONFIG_NANOKERNEL
-
 /*
  * Nanokernel version of hello world demo has a task and a fiber that utilize
  * semaphores and timers to take turns printing a greeting message at
@@ -76,5 +74,3 @@ void main(void)
 		nano_task_sem_take(&nanoSemTask, TICKS_UNLIMITED);
 	}
 }
-
-#endif /* CONFIG_NANOKERNEL */
diff --git a/samples/legacy/task_profiler/profiler/src/profiler.c b/samples/legacy/task_profiler/profiler/src/profiler.c
index 795c771dca..6ba123ad63 100644
--- a/samples/legacy/task_profiler/profiler/src/profiler.c
+++ b/samples/legacy/task_profiler/profiler/src/profiler.c
@@ -345,7 +345,6 @@ void prof_flush(void)
 #endif /* ! PROF_UART_TESTMODE */
 }
 
-#ifdef CONFIG_MICROKERNEL
 
 void prof(void)
 {
@@ -359,4 +358,3 @@ void prof(void)
 	}
 }
 
-#endif /* CONFIG_MICROKERNEL */
diff --git a/samples/net/dhcpv4_client/src/main.c b/samples/net/dhcpv4_client/src/main.c
index 54d173a154..cf6a130b8a 100644
--- a/samples/net/dhcpv4_client/src/main.c
+++ b/samples/net/dhcpv4_client/src/main.c
@@ -57,10 +57,6 @@ void main_fiber(void)
 	k_sem_take(&quit_lock, K_FOREVER);
 }
 
-#if defined(CONFIG_NANOKERNEL)
-#define STACKSIZE 2000
-char __noinit __stack fiberStack[STACKSIZE];
-#endif
 
 void main(void)
 {
@@ -68,10 +64,5 @@ void main(void)
 
 	init_app();
 
-#if defined(CONFIG_MICROKERNEL)
 	main_fiber();
-#else
-	task_fiber_start(&fiberStack[0], STACKSIZE,
-			(nano_fiber_entry_t)main_fiber, 0, 0, 7, 0);
-#endif
 }
diff --git a/tests/legacy/benchmark/footprint/microkernel/float/arm.conf b/tests/legacy/benchmark/footprint/microkernel/float/arm.conf
index 60572d6bd1..6f4a06cca2 100644
--- a/tests/legacy/benchmark/footprint/microkernel/float/arm.conf
+++ b/tests/legacy/benchmark/footprint/microkernel/float/arm.conf
@@ -6,7 +6,6 @@ CONFIG_STDOUT_CONSOLE=y
 CONFIG_NUM_TASK_PRIORITIES=64
 CONFIG_NUM_COMMAND_PACKETS=64
 CONFIG_NUM_TIMER_PACKETS=16
-CONFIG_MICROKERNEL_SERVER_STACK_SIZE=4096
 CONFIG_HEAP_MEM_POOL_SIZE=256
 CONFIG_SYS_POWER_MANAGEMENT=y
 CONFIG_THREAD_CUSTOM_DATA=y
diff --git a/tests/legacy/benchmark/footprint/microkernel/float/x86.conf b/tests/legacy/benchmark/footprint/microkernel/float/x86.conf
index c95748444d..e0f49ca2b2 100644
--- a/tests/legacy/benchmark/footprint/microkernel/float/x86.conf
+++ b/tests/legacy/benchmark/footprint/microkernel/float/x86.conf
@@ -7,7 +7,6 @@ CONFIG_IDT_NUM_VECTORS=256
 CONFIG_NUM_TASK_PRIORITIES=64
 CONFIG_NUM_COMMAND_PACKETS=64
 CONFIG_NUM_TIMER_PACKETS=16
-CONFIG_MICROKERNEL_SERVER_STACK_SIZE=4096
 CONFIG_HEAP_MEM_POOL_SIZE=256
 CONFIG_SYS_POWER_MANAGEMENT=y
 CONFIG_FLOAT=y
diff --git a/tests/legacy/benchmark/footprint/microkernel/max/arm.conf b/tests/legacy/benchmark/footprint/microkernel/max/arm.conf
index 9ea117e3d5..2a9a1f397d 100644
--- a/tests/legacy/benchmark/footprint/microkernel/max/arm.conf
+++ b/tests/legacy/benchmark/footprint/microkernel/max/arm.conf
@@ -6,7 +6,6 @@ CONFIG_STDOUT_CONSOLE=y
 CONFIG_NUM_TASK_PRIORITIES=64
 CONFIG_NUM_COMMAND_PACKETS=64
 CONFIG_NUM_TIMER_PACKETS=16
-CONFIG_MICROKERNEL_SERVER_STACK_SIZE=4096
 CONFIG_SYS_POWER_MANAGEMENT=y
 CONFIG_NUM_IRQS=43
 CONFIG_THREAD_CUSTOM_DATA=y
diff --git a/tests/legacy/benchmark/footprint/microkernel/max/x86.conf b/tests/legacy/benchmark/footprint/microkernel/max/x86.conf
index 559f9f72c2..1c73a0c626 100644
--- a/tests/legacy/benchmark/footprint/microkernel/max/x86.conf
+++ b/tests/legacy/benchmark/footprint/microkernel/max/x86.conf
@@ -7,7 +7,6 @@ CONFIG_IDT_NUM_VECTORS=256
 CONFIG_NUM_TASK_PRIORITIES=64
 CONFIG_NUM_COMMAND_PACKETS=64
 CONFIG_NUM_TIMER_PACKETS=16
-CONFIG_MICROKERNEL_SERVER_STACK_SIZE=4096
 CONFIG_SYS_POWER_MANAGEMENT=y
 CONFIG_THREAD_CUSTOM_DATA=y
 CONFIG_HEAP_MEM_POOL_SIZE=256
diff --git a/tests/legacy/benchmark/footprint/microkernel/min/arm.conf b/tests/legacy/benchmark/footprint/microkernel/min/arm.conf
index aa2bebb7ab..a6c44f473a 100644
--- a/tests/legacy/benchmark/footprint/microkernel/min/arm.conf
+++ b/tests/legacy/benchmark/footprint/microkernel/min/arm.conf
@@ -6,7 +6,6 @@ CONFIG_PRINTK=n
 CONFIG_NUM_TASK_PRIORITIES=2
 CONFIG_NUM_COMMAND_PACKETS=8
 CONFIG_NUM_TIMER_PACKETS=4
-CONFIG_MICROKERNEL_SERVER_STACK_SIZE=128
 CONFIG_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_ERRNO=n
diff --git a/tests/legacy/benchmark/footprint/microkernel/min/galileo.conf b/tests/legacy/benchmark/footprint/microkernel/min/galileo.conf
index fd2c38efb2..adb9eeed1a 100644
--- a/tests/legacy/benchmark/footprint/microkernel/min/galileo.conf
+++ b/tests/legacy/benchmark/footprint/microkernel/min/galileo.conf
@@ -8,7 +8,6 @@ CONFIG_IDT_NUM_VECTORS=36
 CONFIG_NUM_TASK_PRIORITIES=2
 CONFIG_NUM_COMMAND_PACKETS=8
 CONFIG_NUM_TIMER_PACKETS=4
-CONFIG_MICROKERNEL_SERVER_STACK_SIZE=128
 CONFIG_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_PINMUX=n
diff --git a/tests/legacy/benchmark/footprint/microkernel/min/x86.conf b/tests/legacy/benchmark/footprint/microkernel/min/x86.conf
index ea3a5e9a57..0ba8a1d3ab 100644
--- a/tests/legacy/benchmark/footprint/microkernel/min/x86.conf
+++ b/tests/legacy/benchmark/footprint/microkernel/min/x86.conf
@@ -8,7 +8,6 @@ CONFIG_IDT_NUM_VECTORS=33
 CONFIG_NUM_TASK_PRIORITIES=2
 CONFIG_NUM_COMMAND_PACKETS=8
 CONFIG_NUM_TIMER_PACKETS=4
-CONFIG_MICROKERNEL_SERVER_STACK_SIZE=128
 CONFIG_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_IPM=n
diff --git a/tests/ztest/include/ztest.h b/tests/ztest/include/ztest.h
index f18d572d56..145b76a117 100644
--- a/tests/ztest/include/ztest.h
+++ b/tests/ztest/include/ztest.h
@@ -31,7 +31,6 @@
 #define CONFIG_STDOUT_CONSOLE 1
 #define CONFIG_ZTEST_ASSERT_VERBOSE 1
 #define CONFIG_ZTEST_MOCKING
-#define CONFIG_MICROKERNEL 1
 #define CONFIG_NUM_COOP_PRIORITIES 16
 /* FIXME: Properly integrate with Zephyr's arch specific code */
 #define CONFIG_X86 1