Cleaning up unused setup and teardown in product test