another bunch of clean-ups for the kernel