Remove unused code
Merge pull request #885 from mattr-/remove-unused-code

Remove unused code