Fix token clean-up so that timed out tokens are visibly timed-out rather than deleted