Cleanup -m 61xx kernels to latest standard