Cleanup cruft. Closes #51.