diff --git a/zephyr/wrapper.c b/zephyr/wrapper.c
index 695d128a6326..be4c312c8934 100644
--- a/zephyr/wrapper.c
+++ b/zephyr/wrapper.c
@@ -153,29 +153,6 @@ unsigned int _xtos_ints_off(unsigned int mask)
 	return 0;
 }
 
-/*
- * Audio components.
- *
- * Integrated except for linkage so symbols are "used" here until linker
- * support is ready in Zephyr. TODO: fix component linkage in Zephyr.
- */
-
-/* TODO: this is not yet working with Zephyr - section has been created but
- *  no symbols are being loaded into ELF file.
- */
-extern intptr_t _module_init_start;
-extern intptr_t _module_init_end;
-
-static void sys_module_init(void)
-{
-#if !CONFIG_LIBRARY
-	intptr_t *module_init = (intptr_t *)(&_module_init_start);
-
-	for (; module_init < (intptr_t *)&_module_init_end; ++module_init)
-		((void(*)(void))(*module_init))();
-#endif
-}
-
 /* Zephyr redefines log_message() and mtrace_printf() which leaves
  * totally empty the .static_log_entries ELF sections for the
  * sof-logger. This makes smex fail. Define at least one such section to
@@ -202,9 +179,6 @@ int task_main_start(struct sof *sof)
 	/* init default audio components */
 	sys_comp_init(sof);
 
-	/* init self-registered modules */
-	sys_module_init();
-
 	/* init pipeline position offsets */
 	pipeline_posn_init(sof);