Clean up. Fixes #150.