Fixed regex issue with token clean up