Addresses some of #6.
Removed dead code.
Fixes #6.