Resolved an issue with retaining tokens and when not to.