Cleanup -m 1720 kernels to latest standard