Cleanup. Fixes #15