changed receiver tear down logic