Added tear-down