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

remove unused code