removed some dead code
Merge pull request #3730 from ZappoMan/deadcode

removed some dead code