fix remaining references to expires_at