renaming; speeding up teardown