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

remove unneeded codes