Cleanup. This closes #10