Remove a bunch of internal stuff from kernel.inc