kernel: overall cleanup #2