remove unused code
Merge pull request #1135 from gaohoward/2.3.x.hq-1208

remove unused code