Partner cleanup