Cleanup (fixes #12)