thermal: cleanup
kernel: cpu: fixup