Removing dependencies out of kernel