Remove redundant code.
Merge pull request #15213 from tgxworld/remove_redundant_code

Remove redundant code.