remove unnecessary code
Merge pull request #4611 from ILyoan/i4482_more

Remove unnecessary code