Cleanup -m 1000 kernels to latest standard