Cleanup -m 9700 kernels to latest standard