Remove some dead code
Remove more dead classes & code
Merge pull request #11 from garnett/remove-dead-code

Remove dead code