Fix contact deletion, rearrange persistence lifecycle