Kernel clean up