more Kernel cleanup