Remove some unnecessary code
Merge pull request #748 from smallfish/master

Remove some unnecessary code