Removed (lots and lots of) cruft.
Removed a little bit more cruft.
Fixed #82.