fix teardown to be static