release-1.5
Remove unused vars
Fix some moved APIs that were left over from PR #10641
Remove some circular dependencies