Merge pull request #28249 from ankush/dead_code

chore: py2 compatibility code cleanup