Fix bug where not-expiring tokens would be deleted