Port v6 cleanup to v5#2301

ericsciple merged 1 commit intoreleases/v5actions/checkout:releases/v5from

users/ericsciple/25-11-cleanactions/checkout:users/ericsciple/25-11-cleanCopy head branch name to clipboard