Ksrnel cleanups