Removes unused code
Merge pull request #871 from chrisleishman/remove_unused

Removes unused code