Merge pull request #3628 from nutty898/#4557

Remove useless codes[ci skip]