Add graceful tear-down.