Merge pull request #1512 from tnull/2022-05-remove-deprecated-scorer