kernel: overall cleanup #1