Index: uspace/lib/libc/arch/amd64/src/entry.s
===================================================================
--- uspace/lib/libc/arch/amd64/src/entry.s	(revision d2bdd245794445742f74c4a92a38c05358462a0d)
+++ uspace/lib/libc/arch/amd64/src/entry.s	(revision a4b4b477ce8fa31b172f0af3ad053123b08c5c93)
@@ -32,5 +32,4 @@
 
 .globl __entry
-.globl __entry_driver
 
 ## User-space task entry point
@@ -39,10 +38,4 @@
 __entry:
 	call __main
-	call __io_init
 	call main
 	call __exit
-
-__entry_driver:
-	call __main
-	call main
-	call __exit
Index: uspace/lib/libc/arch/ia32/include/config.h
===================================================================
--- uspace/lib/libc/arch/ia32/include/config.h	(revision d2bdd245794445742f74c4a92a38c05358462a0d)
+++ uspace/lib/libc/arch/ia32/include/config.h	(revision a4b4b477ce8fa31b172f0af3ad053123b08c5c93)
@@ -37,5 +37,5 @@
 
 #define PAGE_WIDTH	12
-#define PAGE_SIZE	(1<<PAGE_WIDTH)
+#define PAGE_SIZE	(1 << PAGE_WIDTH)
 #define PAGE_COLOR_BITS	0		/* dummy */
 
Index: uspace/lib/libc/arch/ia32/src/entry.s
===================================================================
--- uspace/lib/libc/arch/ia32/src/entry.s	(revision d2bdd245794445742f74c4a92a38c05358462a0d)
+++ uspace/lib/libc/arch/ia32/src/entry.s	(revision a4b4b477ce8fa31b172f0af3ad053123b08c5c93)
@@ -32,5 +32,4 @@
 
 .globl __entry
-.globl __entry_driver
 
 ## User-space task entry point
@@ -45,16 +44,4 @@
 	
 	call __main
-	call __io_init
 	call main
 	call __exit
-	
-__entry_driver:
-	mov %ss, %ax
-	mov %ax, %ds
-	mov %ax, %es
-	mov %ax, %fs
-	# Do not set %gs, it contains descriptor that can see TLS
-	
-	call __main
-	call main
-	call __exit
Index: uspace/lib/libc/arch/ia32/src/syscall.S
===================================================================
--- uspace/lib/libc/arch/ia32/src/syscall.S	(revision d2bdd245794445742f74c4a92a38c05358462a0d)
+++ uspace/lib/libc/arch/ia32/src/syscall.S	(revision a4b4b477ce8fa31b172f0af3ad053123b08c5c93)
@@ -54,3 +54,2 @@
 	popl %ebx
 	ret
-
Index: uspace/lib/libc/arch/ppc32/src/entry.s
===================================================================
--- uspace/lib/libc/arch/ppc32/src/entry.s	(revision d2bdd245794445742f74c4a92a38c05358462a0d)
+++ uspace/lib/libc/arch/ppc32/src/entry.s	(revision a4b4b477ce8fa31b172f0af3ad053123b08c5c93)
@@ -32,5 +32,4 @@
 
 .globl __entry
-.globl __entry_driver
 
 ## User-space task entry point
@@ -39,10 +38,4 @@
 __entry:
 	bl __main
-	bl __io_init
 	bl main
 	bl __exit
-
-__entry_driver:
-	bl __main
-	bl main
-	bl __exit
Index: uspace/lib/libc/arch/sparc64/src/entry.s
===================================================================
--- uspace/lib/libc/arch/sparc64/src/entry.s	(revision d2bdd245794445742f74c4a92a38c05358462a0d)
+++ uspace/lib/libc/arch/sparc64/src/entry.s	(revision a4b4b477ce8fa31b172f0af3ad053123b08c5c93)
@@ -32,5 +32,4 @@
 
 .globl __entry
-.globl __entry_driver
 
 ## User-space task entry point
@@ -41,17 +40,6 @@
 	call __main
 	or %l7, %lo(_gp), %l7
-	call __io_init
-	nop
 	call main
 	nop
 	call __exit
 	nop
-
-__entry_driver:
-	sethi %hi(_gp), %l7
-	call __main
-	or %l7, %lo(_gp), %l7
-	call main
-	nop
-	call __exit
-	nop