Removing kernel code from master