Remove some leftovers in the kernel