Refactor clear_expiry