kernel changes, cleanup