Bulldozing unnecessary code.
Merge pull request #3 from jcdavison/remove-unnecessary-code

Bulldozing unnecessary code.