Remove duplicate getTenantName method