Once we remove the tenant ID from the URI for Barbican, will there be a need for 'tenant ID' anymore?