added extra items to teardown