=further cleanup in kernel