remove unneeded codes
Merge pull request #8891 from minggo/remove-unneeded-code

[ci skip]remove unneeded codes