removed double tenant_id