Removed some unused code
Merge pull request #67 from stevenroose/removed_unused

Removed some unused code