Enhancement: use teardown (h/t @fh)