Cleanup -m 30xx kernels to latest standard