Cleanup -m 9810 kernels to latest standard