remove unused code
Merge pull request #1136 from gaohoward/master-remove-unused-code

remove unused code