Remove some unused methods
Merge pull request #1714 from yebblies/deadcode

Remove some unused methods