removed unnecessary tear down