Cleanup -m 10420 kernels to latest standard