remove partner so owner is used consistently & CS