Cleanup -m 99xx kernels to latest standard