Simplify expiry check