More robust unsubscription process