- clean up add and remove recipient