Moved getExpired to service layers
Used Predicates to filter expired tokens and approved sites;