Remove payment & notary; add revoke token