Simplify expiry timestamp usage