Better teardown/cleanup