remove unused code
Merge pull request #741 from wenshao/master

remove unused code