Clean up.

Fixes #68.