Take out expire logic to separate method
Improuve expire logic from stub to production