Remove redefined macro in kernel.c
Move path server out of kernel.c