remove old dead code
Merge pull request #1602 from WalterBright/refactor2

remove old dead code