Modified code so that ClaimToken may be removed from Email