remove unneeded codes
Merge pull request #6602 from minggo/remove-unneeded-codes

remove unneeded codes