Depreciate tenantId methods