Teardown cleanup. Closes #2