Cleanup Kernel.java