Change target ret/cleanup