clean redundant code
Merge pull request #840 from ganyangbbl/clear_code

clean redundant code