SONAR-14245 Drop organization related tables

60 files changed, 8 insertions, 744 deletions

diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/ce/CeService.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/ce/CeService.java
index d51cba6c3db..802590b5e00 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/ce/CeService.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/ce/CeService.java
@@ -207,7 +207,6 @@ public class CeService extends BaseService {
     return call(
       new PostRequest(path("submit"))
         .setParam("characteristic", request.getCharacteristic())
-        .setParam("organization", request.getOrganization())
         .setParam("projectBranch", request.getProjectBranch())
         .setParam("projectKey", request.getProjectKey())
         .setParam("projectName", request.getProjectName())
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/ce/SubmitRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/ce/SubmitRequest.java
index e4da52274e6..d856e547bea 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/ce/SubmitRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/ce/SubmitRequest.java
@@ -31,7 +31,6 @@ import javax.annotation.Generated;
 public class SubmitRequest {
 
   private String characteristic;
-  private String organization;
   private String projectBranch;
   private String projectKey;
   private String projectName;
@@ -50,19 +49,6 @@ public class SubmitRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public SubmitRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Example value: "branch-1.x"
    */
   public SubmitRequest setProjectBranch(String projectBranch) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/components/ComponentsService.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/components/ComponentsService.java
index 4a40015d02c..945a94ab6d2 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/components/ComponentsService.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/components/ComponentsService.java
@@ -70,7 +70,6 @@ public class ComponentsService extends BaseService {
     return call(
       new GetRequest(path("search"))
         .setParam("language", request.getLanguage())
-        .setParam("organization", request.getOrganization())
         .setParam("p", request.getP())
         .setParam("ps", request.getPs())
         .setParam("q", request.getQ())
@@ -92,7 +91,6 @@ public class ComponentsService extends BaseService {
         .setParam("f", request.getF() == null ? null : request.getF().stream().collect(Collectors.joining(",")))
         .setParam("facets", request.getFacets() == null ? null : request.getFacets().stream().collect(Collectors.joining(",")))
         .setParam("filter", request.getFilter())
-        .setParam("organization", request.getOrganization())
         .setParam("p", request.getP())
         .setParam("ps", request.getPs())
         .setParam("s", request.getS()),
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/components/SearchProjectsRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/components/SearchProjectsRequest.java
index 7e0a1f7542d..13e0b0b0092 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/components/SearchProjectsRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/components/SearchProjectsRequest.java
@@ -35,7 +35,6 @@ public class SearchProjectsRequest {
   private List<String> f;
   private List<String> facets;
   private String filter;
-  private String organization;
   private String p;
   private String ps;
   private String s;
@@ -115,18 +114,6 @@ public class SearchProjectsRequest {
   }
 
   /**
-   * This is part of the internal API.
-   */
-  public SearchProjectsRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Example value: "42"
    */
   public SearchProjectsRequest setP(String p) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/components/SearchRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/components/SearchRequest.java
index fd3964493b7..76b04fb2b54 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/components/SearchRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/components/SearchRequest.java
@@ -32,7 +32,6 @@ import javax.annotation.Generated;
 public class SearchRequest {
 
   private String language;
-  private String organization;
   private String p;
   private String ps;
   private String q;
@@ -51,19 +50,6 @@ public class SearchRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public SearchRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Example value: "42"
    */
   public SearchRequest setP(String p) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/issue/IssuesWsParameters.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/issue/IssuesWsParameters.java
index c96e1da5e6a..9e5e4bfa76a 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/issue/IssuesWsParameters.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/issue/IssuesWsParameters.java
@@ -62,7 +62,6 @@ public class IssuesWsParameters {
   public static final String PARAM_ON_COMPONENT_ONLY = "onComponentOnly";
   public static final String PARAM_BRANCH = "branch";
   public static final String PARAM_PULL_REQUEST = "pullRequest";
-  public static final String PARAM_ORGANIZATION = "organization";
   public static final String PARAM_RULES = "rules";
   public static final String PARAM_ASSIGN = "assign";
   public static final String PARAM_SET_SEVERITY = "set_severity";
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/navigation/NavigationService.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/navigation/NavigationService.java
index 72ccca0c022..250177d5fa3 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/navigation/NavigationService.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/navigation/NavigationService.java
@@ -70,21 +70,6 @@ public class NavigationService extends BaseService {
    *
    * This is part of the internal API.
    * This is a GET request.
-   * @see <a href="https://next.sonarqube.com/sonarqube/web_api/api/navigation/organization">Further information about this action online (including a response example)</a>
-   * @since 6.3
-   */
-  public String organization(OrganizationRequest request) {
-    return call(
-      new GetRequest(path("organization"))
-        .setParam("organization", request.getOrganization())
-        .setMediaType(MediaTypes.JSON)
-      ).content();
-  }
-
-  /**
-   *
-   * This is part of the internal API.
-   * This is a GET request.
    * @see <a href="https://next.sonarqube.com/sonarqube/web_api/api/navigation/settings">Further information about this action online (including a response example)</a>
    * @since 5.2
    */
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/navigation/OrganizationRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/navigation/OrganizationRequest.java
deleted file mode 100644
index 6ccf586f132..00000000000
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/navigation/OrganizationRequest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2021 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.sonarqube.ws.client.navigation;
-
-import javax.annotation.Generated;
-
-/**
- * This is part of the internal API.
- * This is a POST request.
- * @see <a href="https://next.sonarqube.com/sonarqube/web_api/api/navigation/organization">Further information about this action online (including a response example)</a>
- * @since 6.3
- */
-@Generated("sonar-ws-generator")
-public class OrganizationRequest {
-
-  private String organization;
-
-  /**
-   * This is a mandatory parameter.
-   * Example value: "my-org"
-   */
-  public OrganizationRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-}
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/AddGroupRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/AddGroupRequest.java
index d1c8f9f21e5..c4a3a936c4c 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/AddGroupRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/AddGroupRequest.java
@@ -32,7 +32,6 @@ public class AddGroupRequest {
 
   private String groupId;
   private String groupName;
-  private String organization;
   private String permission;
   private String projectId;
   private String projectKey;
@@ -62,19 +61,6 @@ public class AddGroupRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public AddGroupRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * This is a mandatory parameter.
    */
   public AddGroupRequest setPermission(String permission) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/AddGroupToTemplateRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/AddGroupToTemplateRequest.java
index cfd7b8cfdff..a7a82dfa12b 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/AddGroupToTemplateRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/AddGroupToTemplateRequest.java
@@ -32,7 +32,6 @@ public class AddGroupToTemplateRequest {
 
   private String groupId;
   private String groupName;
-  private String organization;
   private String permission;
   private String templateId;
   private String templateName;
@@ -62,19 +61,6 @@ public class AddGroupToTemplateRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public AddGroupToTemplateRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * This is a mandatory parameter.
    * Possible values:
    * <ul>
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/AddProjectCreatorToTemplateRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/AddProjectCreatorToTemplateRequest.java
index 525bd9754fe..4f954b863bc 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/AddProjectCreatorToTemplateRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/AddProjectCreatorToTemplateRequest.java
@@ -30,25 +30,11 @@ import javax.annotation.Generated;
 @Generated("sonar-ws-generator")
 public class AddProjectCreatorToTemplateRequest {
 
-  private String organization;
   private String permission;
   private String templateId;
   private String templateName;
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public AddProjectCreatorToTemplateRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * This is a mandatory parameter.
    * Possible values:
    * <ul>
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/AddUserRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/AddUserRequest.java
index 107fe903810..4a2776eac95 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/AddUserRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/AddUserRequest.java
@@ -31,7 +31,6 @@ import javax.annotation.Generated;
 public class AddUserRequest {
 
   private String login;
-  private String organization;
   private String permission;
   private String projectId;
   private String projectKey;
@@ -50,19 +49,6 @@ public class AddUserRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public AddUserRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * This is a mandatory parameter.
    */
   public AddUserRequest setPermission(String permission) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/AddUserToTemplateRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/AddUserToTemplateRequest.java
index 40ba90f9d16..e6a5b36ddf8 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/AddUserToTemplateRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/AddUserToTemplateRequest.java
@@ -31,7 +31,6 @@ import javax.annotation.Generated;
 public class AddUserToTemplateRequest {
 
   private String login;
-  private String organization;
   private String permission;
   private String templateId;
   private String templateName;
@@ -50,19 +49,6 @@ public class AddUserToTemplateRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public AddUserToTemplateRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * This is a mandatory parameter.
    * Possible values:
    * <ul>
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/ApplyTemplateRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/ApplyTemplateRequest.java
index 1734f93f737..fbc99734498 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/ApplyTemplateRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/ApplyTemplateRequest.java
@@ -30,26 +30,12 @@ import javax.annotation.Generated;
 @Generated("sonar-ws-generator")
 public class ApplyTemplateRequest {
 
-  private String organization;
   private String projectId;
   private String projectKey;
   private String templateId;
   private String templateName;
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public ApplyTemplateRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Example value: "ce4c03d6-430f-40a9-b777-ad877c00aa4d"
    */
   public ApplyTemplateRequest setProjectId(String projectId) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/BulkApplyTemplateRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/BulkApplyTemplateRequest.java
index b5ac97dcf13..33908b6747b 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/BulkApplyTemplateRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/BulkApplyTemplateRequest.java
@@ -33,7 +33,6 @@ public class BulkApplyTemplateRequest {
 
   private String analyzedBefore;
   private String onProvisionedOnly;
-  private String organization;
   private List<String> projects;
   private String q;
   private List<String> qualifiers;
@@ -72,19 +71,6 @@ public class BulkApplyTemplateRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public BulkApplyTemplateRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Example value: "my_project,another_project"
    */
   public BulkApplyTemplateRequest setProjects(List<String> projects) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/CreateTemplateRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/CreateTemplateRequest.java
index 6c27158ecba..9746aea0027 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/CreateTemplateRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/CreateTemplateRequest.java
@@ -32,7 +32,6 @@ public class CreateTemplateRequest {
 
   private String description;
   private String name;
-  private String organization;
   private String projectKeyPattern;
 
   /**
@@ -61,19 +60,6 @@ public class CreateTemplateRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public CreateTemplateRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Example value: ".*\\.finance\\..*"
    */
   public CreateTemplateRequest setProjectKeyPattern(String projectKeyPattern) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/DeleteTemplateRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/DeleteTemplateRequest.java
index f71fb2ed4bf..d5f3b987774 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/DeleteTemplateRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/DeleteTemplateRequest.java
@@ -30,24 +30,10 @@ import javax.annotation.Generated;
 @Generated("sonar-ws-generator")
 public class DeleteTemplateRequest {
 
-  private String organization;
   private String templateId;
   private String templateName;
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public DeleteTemplateRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Example value: "AU-Tpxb--iU5OvuD2FLy"
    */
   public DeleteTemplateRequest setTemplateId(String templateId) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/GroupsRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/GroupsRequest.java
index 169cdd1e871..eb915a6720f 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/GroupsRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/GroupsRequest.java
@@ -30,7 +30,6 @@ import javax.annotation.Generated;
 @Generated("sonar-ws-generator")
 public class GroupsRequest {
 
-  private String organization;
   private String p;
   private String permission;
   private String projectId;
@@ -39,19 +38,6 @@ public class GroupsRequest {
   private String q;
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public GroupsRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Example value: "42"
    */
   public GroupsRequest setP(String p) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/PermissionsService.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/PermissionsService.java
index 160eb51becf..683bc87dfaf 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/PermissionsService.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/PermissionsService.java
@@ -57,7 +57,6 @@ public class PermissionsService extends BaseService {
       new PostRequest(path("add_group"))
         .setParam("groupId", request.getGroupId())
         .setParam("groupName", request.getGroupName())
-        .setParam("organization", request.getOrganization())
         .setParam("permission", request.getPermission())
         .setParam("projectId", request.getProjectId())
         .setParam("projectKey", request.getProjectKey())
@@ -77,7 +76,6 @@ public class PermissionsService extends BaseService {
       new PostRequest(path("add_group_to_template"))
         .setParam("groupId", request.getGroupId())
         .setParam("groupName", request.getGroupName())
-        .setParam("organization", request.getOrganization())
         .setParam("permission", request.getPermission())
         .setParam("templateId", request.getTemplateId())
         .setParam("templateName", request.getTemplateName())
@@ -95,7 +93,6 @@ public class PermissionsService extends BaseService {
   public void addProjectCreatorToTemplate(AddProjectCreatorToTemplateRequest request) {
     call(
       new PostRequest(path("add_project_creator_to_template"))
-        .setParam("organization", request.getOrganization())
         .setParam("permission", request.getPermission())
         .setParam("templateId", request.getTemplateId())
         .setParam("templateName", request.getTemplateName())
@@ -114,7 +111,6 @@ public class PermissionsService extends BaseService {
     call(
       new PostRequest(path("add_user"))
         .setParam("login", request.getLogin())
-        .setParam("organization", request.getOrganization())
         .setParam("permission", request.getPermission())
         .setParam("projectId", request.getProjectId())
         .setParam("projectKey", request.getProjectKey())
@@ -133,7 +129,6 @@ public class PermissionsService extends BaseService {
     call(
       new PostRequest(path("add_user_to_template"))
         .setParam("login", request.getLogin())
-        .setParam("organization", request.getOrganization())
         .setParam("permission", request.getPermission())
         .setParam("templateId", request.getTemplateId())
         .setParam("templateName", request.getTemplateName())
@@ -151,7 +146,6 @@ public class PermissionsService extends BaseService {
   public void applyTemplate(ApplyTemplateRequest request) {
     call(
       new PostRequest(path("apply_template"))
-        .setParam("organization", request.getOrganization())
         .setParam("projectId", request.getProjectId())
         .setParam("projectKey", request.getProjectKey())
         .setParam("templateId", request.getTemplateId())
@@ -172,7 +166,6 @@ public class PermissionsService extends BaseService {
       new PostRequest(path("bulk_apply_template"))
         .setParam("analyzedBefore", request.getAnalyzedBefore())
         .setParam("onProvisionedOnly", request.getOnProvisionedOnly())
-        .setParam("organization", request.getOrganization())
         .setParam("projects", request.getProjects() == null ? null : request.getProjects().stream().collect(Collectors.joining(",")))
         .setParam("q", request.getQ())
         .setParam("qualifiers", request.getQualifiers() == null ? null : request.getQualifiers().stream().collect(Collectors.joining(",")))
@@ -195,7 +188,6 @@ public class PermissionsService extends BaseService {
       new PostRequest(path("create_template"))
         .setParam("description", request.getDescription())
         .setParam("name", request.getName())
-        .setParam("organization", request.getOrganization())
         .setParam("projectKeyPattern", request.getProjectKeyPattern()),
       CreateTemplateWsResponse.parser());
   }
@@ -210,7 +202,6 @@ public class PermissionsService extends BaseService {
   public void deleteTemplate(DeleteTemplateRequest request) {
     call(
       new PostRequest(path("delete_template"))
-        .setParam("organization", request.getOrganization())
         .setParam("templateId", request.getTemplateId())
         .setParam("templateName", request.getTemplateName())
         .setMediaType(MediaTypes.JSON)
@@ -227,7 +218,6 @@ public class PermissionsService extends BaseService {
   public WsGroupsResponse groups(GroupsRequest request) {
     return call(
       new GetRequest(path("groups"))
-        .setParam("organization", request.getOrganization())
         .setParam("p", request.getP())
         .setParam("permission", request.getPermission())
         .setParam("projectId", request.getProjectId())
@@ -249,7 +239,6 @@ public class PermissionsService extends BaseService {
       new PostRequest(path("remove_group"))
         .setParam("groupId", request.getGroupId())
         .setParam("groupName", request.getGroupName())
-        .setParam("organization", request.getOrganization())
         .setParam("permission", request.getPermission())
         .setParam("projectId", request.getProjectId())
         .setParam("projectKey", request.getProjectKey())
@@ -269,7 +258,6 @@ public class PermissionsService extends BaseService {
       new PostRequest(path("remove_group_from_template"))
         .setParam("groupId", request.getGroupId())
         .setParam("groupName", request.getGroupName())
-        .setParam("organization", request.getOrganization())
         .setParam("permission", request.getPermission())
         .setParam("templateId", request.getTemplateId())
         .setParam("templateName", request.getTemplateName())
@@ -287,7 +275,6 @@ public class PermissionsService extends BaseService {
   public void removeProjectCreatorFromTemplate(RemoveProjectCreatorFromTemplateRequest request) {
     call(
       new PostRequest(path("remove_project_creator_from_template"))
-        .setParam("organization", request.getOrganization())
         .setParam("permission", request.getPermission())
         .setParam("templateId", request.getTemplateId())
         .setParam("templateName", request.getTemplateName())
@@ -306,7 +293,6 @@ public class PermissionsService extends BaseService {
     call(
       new PostRequest(path("remove_user"))
         .setParam("login", request.getLogin())
-        .setParam("organization", request.getOrganization())
         .setParam("permission", request.getPermission())
         .setParam("projectId", request.getProjectId())
         .setParam("projectKey", request.getProjectKey())
@@ -325,7 +311,6 @@ public class PermissionsService extends BaseService {
     call(
       new PostRequest(path("remove_user_from_template"))
         .setParam("login", request.getLogin())
-        .setParam("organization", request.getOrganization())
         .setParam("permission", request.getPermission())
         .setParam("templateId", request.getTemplateId())
         .setParam("templateName", request.getTemplateName())
@@ -344,8 +329,7 @@ public class PermissionsService extends BaseService {
   @Deprecated
   public WsSearchGlobalPermissionsResponse searchGlobalPermissions(SearchGlobalPermissionsRequest request) {
     return call(
-      new GetRequest(path("search_global_permissions"))
-        .setParam("organization", request.getOrganization()),
+      new GetRequest(path("search_global_permissions")),
       WsSearchGlobalPermissionsResponse.parser());
   }
 
@@ -380,7 +364,6 @@ public class PermissionsService extends BaseService {
   public SearchTemplatesWsResponse searchTemplates(SearchTemplatesRequest request) {
     return call(
       new GetRequest(path("search_templates"))
-        .setParam("organization", request.getOrganization())
         .setParam("q", request.getQ()),
       SearchTemplatesWsResponse.parser());
   }
@@ -395,7 +378,6 @@ public class PermissionsService extends BaseService {
   public void setDefaultTemplate(SetDefaultTemplateRequest request) {
     call(
       new PostRequest(path("set_default_template"))
-        .setParam("organization", request.getOrganization())
         .setParam("qualifier", request.getQualifier())
         .setParam("templateId", request.getTemplateId())
         .setParam("templateName", request.getTemplateName())
@@ -413,7 +395,6 @@ public class PermissionsService extends BaseService {
   public WsTemplateGroupsResponse templateGroups(TemplateGroupsRequest request) {
     return call(
       new GetRequest(path("template_groups"))
-        .setParam("organization", request.getOrganization())
         .setParam("p", request.getP())
         .setParam("permission", request.getPermission())
         .setParam("ps", request.getPs())
@@ -433,7 +414,6 @@ public class PermissionsService extends BaseService {
   public String templateUsers(TemplateUsersRequest request) {
     return call(
       new GetRequest(path("template_users"))
-        .setParam("organization", request.getOrganization())
         .setParam("p", request.getP())
         .setParam("permission", request.getPermission())
         .setParam("ps", request.getPs())
@@ -471,7 +451,6 @@ public class PermissionsService extends BaseService {
   public UsersWsResponse users(UsersRequest request) {
     return call(
       new GetRequest(path("users"))
-        .setParam("organization", request.getOrganization())
         .setParam("p", request.getP())
         .setParam("permission", request.getPermission())
         .setParam("projectId", request.getProjectId())
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/RemoveGroupFromTemplateRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/RemoveGroupFromTemplateRequest.java
index 7ed206ee550..ce9a2faf67b 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/RemoveGroupFromTemplateRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/RemoveGroupFromTemplateRequest.java
@@ -32,7 +32,6 @@ public class RemoveGroupFromTemplateRequest {
 
   private String groupId;
   private String groupName;
-  private String organization;
   private String permission;
   private String templateId;
   private String templateName;
@@ -62,19 +61,6 @@ public class RemoveGroupFromTemplateRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public RemoveGroupFromTemplateRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * This is a mandatory parameter.
    * Possible values:
    * <ul>
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/RemoveGroupRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/RemoveGroupRequest.java
index 8c38f282818..4a40dd82f7d 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/RemoveGroupRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/RemoveGroupRequest.java
@@ -32,7 +32,6 @@ public class RemoveGroupRequest {
 
   private String groupId;
   private String groupName;
-  private String organization;
   private String permission;
   private String projectId;
   private String projectKey;
@@ -62,19 +61,6 @@ public class RemoveGroupRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public RemoveGroupRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * This is a mandatory parameter.
    */
   public RemoveGroupRequest setPermission(String permission) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/RemoveProjectCreatorFromTemplateRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/RemoveProjectCreatorFromTemplateRequest.java
index 6f17298b67b..5e9ff48d249 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/RemoveProjectCreatorFromTemplateRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/RemoveProjectCreatorFromTemplateRequest.java
@@ -30,25 +30,11 @@ import javax.annotation.Generated;
 @Generated("sonar-ws-generator")
 public class RemoveProjectCreatorFromTemplateRequest {
 
-  private String organization;
   private String permission;
   private String templateId;
   private String templateName;
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public RemoveProjectCreatorFromTemplateRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * This is a mandatory parameter.
    * Possible values:
    * <ul>
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/RemoveUserFromTemplateRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/RemoveUserFromTemplateRequest.java
index 7251e46c68e..75d84b2037c 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/RemoveUserFromTemplateRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/RemoveUserFromTemplateRequest.java
@@ -31,7 +31,6 @@ import javax.annotation.Generated;
 public class RemoveUserFromTemplateRequest {
 
   private String login;
-  private String organization;
   private String permission;
   private String templateId;
   private String templateName;
@@ -50,19 +49,6 @@ public class RemoveUserFromTemplateRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public RemoveUserFromTemplateRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * This is a mandatory parameter.
    * Possible values:
    * <ul>
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/RemoveUserRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/RemoveUserRequest.java
index 84c26cb6381..cbb288ac5c5 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/RemoveUserRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/RemoveUserRequest.java
@@ -31,7 +31,6 @@ import javax.annotation.Generated;
 public class RemoveUserRequest {
 
   private String login;
-  private String organization;
   private String permission;
   private String projectId;
   private String projectKey;
@@ -50,19 +49,6 @@ public class RemoveUserRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public RemoveUserRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * This is a mandatory parameter.
    */
   public RemoveUserRequest setPermission(String permission) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/SearchGlobalPermissionsRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/SearchGlobalPermissionsRequest.java
index 9faa248dade..424bc60e778 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/SearchGlobalPermissionsRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/SearchGlobalPermissionsRequest.java
@@ -30,18 +30,4 @@ import javax.annotation.Generated;
 @Generated("sonar-ws-generator")
 public class SearchGlobalPermissionsRequest {
 
-  private String organization;
-
-  /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public SearchGlobalPermissionsRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
 }
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/SearchTemplatesRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/SearchTemplatesRequest.java
index 6cea304604f..add14f2ba85 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/SearchTemplatesRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/SearchTemplatesRequest.java
@@ -30,23 +30,9 @@ import javax.annotation.Generated;
 @Generated("sonar-ws-generator")
 public class SearchTemplatesRequest {
 
-  private String organization;
   private String q;
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public SearchTemplatesRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Example value: "defau"
    */
   public SearchTemplatesRequest setQ(String q) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/SetDefaultTemplateRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/SetDefaultTemplateRequest.java
index ae87c349f32..25f450cc19b 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/SetDefaultTemplateRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/SetDefaultTemplateRequest.java
@@ -30,25 +30,11 @@ import javax.annotation.Generated;
 @Generated("sonar-ws-generator")
 public class SetDefaultTemplateRequest {
 
-  private String organization;
   private String qualifier;
   private String templateId;
   private String templateName;
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public SetDefaultTemplateRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Possible values:
    * <ul>
    *   <li>"TRK"</li>
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/TemplateGroupsRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/TemplateGroupsRequest.java
index 280ed6d8eac..51cf1087b05 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/TemplateGroupsRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/TemplateGroupsRequest.java
@@ -30,7 +30,6 @@ import javax.annotation.Generated;
 @Generated("sonar-ws-generator")
 public class TemplateGroupsRequest {
 
-  private String organization;
   private String p;
   private String permission;
   private String ps;
@@ -39,19 +38,6 @@ public class TemplateGroupsRequest {
   private String templateName;
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public TemplateGroupsRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Example value: "42"
    */
   public TemplateGroupsRequest setP(String p) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/TemplateUsersRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/TemplateUsersRequest.java
index 869e99f5169..6f71288dd64 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/TemplateUsersRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/TemplateUsersRequest.java
@@ -30,7 +30,6 @@ import javax.annotation.Generated;
 @Generated("sonar-ws-generator")
 public class TemplateUsersRequest {
 
-  private String organization;
   private String p;
   private String permission;
   private String ps;
@@ -39,19 +38,6 @@ public class TemplateUsersRequest {
   private String templateName;
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public TemplateUsersRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Example value: "42"
    */
   public TemplateUsersRequest setP(String p) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/UsersRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/UsersRequest.java
index b977694f260..0bfdc6fe4bc 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/UsersRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/permissions/UsersRequest.java
@@ -30,7 +30,6 @@ import javax.annotation.Generated;
 @Generated("sonar-ws-generator")
 public class UsersRequest {
 
-  private String organization;
   private String p;
   private String permission;
   private String projectId;
@@ -39,19 +38,6 @@ public class UsersRequest {
   private String q;
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public UsersRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Example value: "42"
    */
   public UsersRequest setP(String p) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/project/ProjectsWsParameters.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/project/ProjectsWsParameters.java
index e29992098bb..cce70ee2f58 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/project/ProjectsWsParameters.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/project/ProjectsWsParameters.java
@@ -36,7 +36,6 @@ public class ProjectsWsParameters {
   public static final String PARAM_PROJECT_ID = "projectId";
   public static final String PARAM_NAME = "name";
   public static final String PARAM_BRANCH = "branch";
-  public static final String PARAM_ORGANIZATION = "organization";
   public static final String PARAM_QUALIFIERS = "qualifiers";
   public static final String PARAM_FROM = "from";
   public static final String PARAM_TO = "to";
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/projects/BulkDeleteRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/projects/BulkDeleteRequest.java
index 5a3dffedcbe..a52520dd3c8 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/projects/BulkDeleteRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/projects/BulkDeleteRequest.java
@@ -33,7 +33,6 @@ public class BulkDeleteRequest {
 
   private String analyzedBefore;
   private String onProvisionedOnly;
-  private String organization;
   private List<String> projects;
   private String q;
   private List<String> qualifiers;
@@ -70,18 +69,6 @@ public class BulkDeleteRequest {
   }
 
   /**
-   * This is part of the internal API.
-   */
-  public BulkDeleteRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Example value: "my_project,another_project"
    */
   public BulkDeleteRequest setProjects(List<String> projects) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/projects/CreateRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/projects/CreateRequest.java
index afe4597926c..698c7eb2791 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/projects/CreateRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/projects/CreateRequest.java
@@ -32,7 +32,6 @@ public class CreateRequest {
 
   private String branch;
   private String name;
-  private String organization;
   private String project;
   private String visibility;
 
@@ -62,18 +61,6 @@ public class CreateRequest {
   }
 
   /**
-   * This is part of the internal API.
-   */
-  public CreateRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * This is a mandatory parameter.
    * Example value: "my_project"
    */
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/projects/ProjectsService.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/projects/ProjectsService.java
index 7d5d7831f78..f28a7289863 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/projects/ProjectsService.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/projects/ProjectsService.java
@@ -53,7 +53,6 @@ public class ProjectsService extends BaseService {
       new PostRequest(path("bulk_delete"))
         .setParam("analyzedBefore", request.getAnalyzedBefore())
         .setParam("onProvisionedOnly", request.getOnProvisionedOnly())
-        .setParam("organization", request.getOrganization())
         .setParam("projects", request.getProjects() == null ? null : request.getProjects().stream().collect(Collectors.joining(",")))
         .setParam("q", request.getQ())
         .setParam("qualifiers", request.getQualifiers() == null ? null : request.getQualifiers().stream().collect(Collectors.joining(",")))
@@ -91,7 +90,6 @@ public class ProjectsService extends BaseService {
       new PostRequest(path("create"))
         .setParam("branch", request.getBranch())
         .setParam("name", request.getName())
-        .setParam("organization", request.getOrganization())
         .setParam("project", request.getProject())
         .setParam("visibility", request.getVisibility()),
       CreateWsResponse.parser());
@@ -124,7 +122,6 @@ public class ProjectsService extends BaseService {
       new GetRequest(path("search"))
         .setParam("analyzedBefore", request.getAnalyzedBefore())
         .setParam("onProvisionedOnly", request.getOnProvisionedOnly())
-        .setParam("organization", request.getOrganization())
         .setParam("p", request.getP())
         .setParam("projects", request.getProjects() == null ? null : request.getProjects().stream().collect(Collectors.joining(",")))
         .setParam("ps", request.getPs())
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/projects/SearchRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/projects/SearchRequest.java
index 9fdc814b02d..fb61e8b0427 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/projects/SearchRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/projects/SearchRequest.java
@@ -33,7 +33,6 @@ public class SearchRequest {
 
   private String analyzedBefore;
   private String onProvisionedOnly;
-  private String organization;
   private String p;
   private List<String> projectIds;
   private List<String> projects;
@@ -73,18 +72,6 @@ public class SearchRequest {
   }
 
   /**
-   * This is part of the internal API.
-   */
-  public SearchRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Example value: "42"
    */
   public SearchRequest setP(String p) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/CopyRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/CopyRequest.java
index d3caeee098c..de36f302cf8 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/CopyRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/CopyRequest.java
@@ -32,7 +32,6 @@ public class CopyRequest {
 
   private String id;
   private String name;
-  private String organization;
 
   /**
    * This is a mandatory parameter.
@@ -59,16 +58,4 @@ public class CopyRequest {
   public String getName() {
     return name;
   }
-
-  /**
-   * Example value: "my-org"
-   */
-  public CopyRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
 }
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/CreateConditionRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/CreateConditionRequest.java
index ccb25e41a7e..b0f0afa7cb6 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/CreateConditionRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/CreateConditionRequest.java
@@ -34,7 +34,6 @@ public class CreateConditionRequest {
   private String gateId;
   private String metric;
   private String op;
-  private String organization;
 
   /**
    * Example value: "10"
@@ -90,16 +89,4 @@ public class CreateConditionRequest {
   public String getOp() {
     return op;
   }
-
-  /**
-   * Example value: "my-org"
-   */
-  public CreateConditionRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
 }
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/CreateRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/CreateRequest.java
index 16384ec73e2..a0a468a85b1 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/CreateRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/CreateRequest.java
@@ -31,7 +31,6 @@ import javax.annotation.Generated;
 public class CreateRequest {
 
   private String name;
-  private String organization;
 
   /**
    * This is a mandatory parameter.
@@ -46,15 +45,4 @@ public class CreateRequest {
     return name;
   }
 
-  /**
-   * Example value: "my-org"
-   */
-  public CreateRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
 }
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/DeleteConditionRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/DeleteConditionRequest.java
index 8f86f5ccf22..50a45a98b9a 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/DeleteConditionRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/DeleteConditionRequest.java
@@ -31,7 +31,6 @@ import javax.annotation.Generated;
 public class DeleteConditionRequest {
 
   private String id;
-  private String organization;
 
   /**
    * This is a mandatory parameter.
@@ -46,15 +45,4 @@ public class DeleteConditionRequest {
     return id;
   }
 
-  /**
-   * Example value: "my-org"
-   */
-  public DeleteConditionRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
 }
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/DeselectRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/DeselectRequest.java
index e760fd69e60..dfb8d9b7bc2 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/DeselectRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/DeselectRequest.java
@@ -30,23 +30,10 @@ import javax.annotation.Generated;
 @Generated("sonar-ws-generator")
 public class DeselectRequest {
 
-  private String organization;
   private String projectId;
   private String projectKey;
 
   /**
-   * Example value: "my-org"
-   */
-  public DeselectRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Example value: "AU-Tpxb--iU5OvuD2FLy"
    * @deprecated since 6.1
    */
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/DestroyRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/DestroyRequest.java
index 4b743b49465..8a2b37e53ed 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/DestroyRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/DestroyRequest.java
@@ -31,7 +31,6 @@ import javax.annotation.Generated;
 public class DestroyRequest {
 
   private String id;
-  private String organization;
 
   /**
    * This is a mandatory parameter.
@@ -45,16 +44,4 @@ public class DestroyRequest {
   public String getId() {
     return id;
   }
-
-  /**
-   * Example value: "my-org"
-   */
-  public DestroyRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
 }
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/GetByProjectRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/GetByProjectRequest.java
index bb7ca56de67..e3428fd1e51 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/GetByProjectRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/GetByProjectRequest.java
@@ -30,22 +30,9 @@ import javax.annotation.Generated;
 @Generated("sonar-ws-generator")
 public class GetByProjectRequest {
 
-  private String organization;
   private String project;
 
   /**
-   * Example value: "my-org"
-   */
-  public GetByProjectRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * This is a mandatory parameter.
    * Example value: "my_project"
    */
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/ListRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/ListRequest.java
index f755d7b8efd..37ff31811b2 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/ListRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/ListRequest.java
@@ -30,17 +30,4 @@ import javax.annotation.Generated;
 @Generated("sonar-ws-generator")
 public class ListRequest {
 
-  private String organization;
-
-  /**
-   * Example value: "my-org"
-   */
-  public ListRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
 }
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/QualitygatesService.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/QualitygatesService.java
index 05a08e16efc..840f39ac8fd 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/QualitygatesService.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/QualitygatesService.java
@@ -56,7 +56,6 @@ public class QualitygatesService extends BaseService {
       new PostRequest(path("copy"))
         .setParam("id", request.getId())
         .setParam("name", request.getName())
-        .setParam("organization", request.getOrganization())
         .setMediaType(MediaTypes.JSON)).content();
   }
 
@@ -70,8 +69,7 @@ public class QualitygatesService extends BaseService {
   public CreateResponse create(CreateRequest request) {
     return call(
       new PostRequest(path("create"))
-        .setParam("name", request.getName())
-        .setParam("organization", request.getOrganization()),
+        .setParam("name", request.getName()),
       CreateResponse.parser());
   }
 
@@ -81,8 +79,7 @@ public class QualitygatesService extends BaseService {
   public CreateResponse createJson(CreateRequest request) {
     return call(
       new PostRequest(path("create"))
-        .setParam("name", request.getName())
-        .setParam("organization", request.getOrganization()),
+        .setParam("name", request.getName()),
       new QualityGatesServiceCreateResponseJsonParser(), MediaTypes.JSON);
   }
 
@@ -99,8 +96,7 @@ public class QualitygatesService extends BaseService {
         .setParam("error", request.getError())
         .setParam("gateId", request.getGateId())
         .setParam("metric", request.getMetric())
-        .setParam("op", request.getOp())
-        .setParam("organization", request.getOrganization()),
+        .setParam("op", request.getOp()),
       CreateConditionResponse.parser());
   }
 
@@ -115,7 +111,6 @@ public class QualitygatesService extends BaseService {
     call(
       new PostRequest(path("delete_condition"))
         .setParam("id", request.getId())
-        .setParam("organization", request.getOrganization())
         .setMediaType(MediaTypes.JSON)).content();
   }
 
@@ -129,7 +124,6 @@ public class QualitygatesService extends BaseService {
   public void deselect(DeselectRequest request) {
     call(
       new PostRequest(path("deselect"))
-        .setParam("organization", request.getOrganization())
         .setParam("projectId", request.getProjectId())
         .setParam("projectKey", request.getProjectKey())
         .setMediaType(MediaTypes.JSON)).content();
@@ -146,7 +140,6 @@ public class QualitygatesService extends BaseService {
     call(
       new PostRequest(path("destroy"))
         .setParam("id", request.getId())
-        .setParam("organization", request.getOrganization())
         .setMediaType(MediaTypes.JSON)).content();
   }
 
@@ -160,7 +153,6 @@ public class QualitygatesService extends BaseService {
   public GetByProjectResponse getByProject(GetByProjectRequest request) {
     return call(
       new GetRequest(path("get_by_project"))
-        .setParam("organization", request.getOrganization())
         .setParam("project", request.getProject()),
       GetByProjectResponse.parser());
   }
@@ -174,8 +166,7 @@ public class QualitygatesService extends BaseService {
    */
   public ListWsResponse list(ListRequest request) {
     return call(
-      new GetRequest(path("list"))
-        .setParam("organization", request.getOrganization()),
+      new GetRequest(path("list")),
       ListWsResponse.parser());
   }
 
@@ -209,7 +200,6 @@ public class QualitygatesService extends BaseService {
       new PostRequest(path("rename"))
         .setParam("id", request.getId())
         .setParam("name", request.getName())
-        .setParam("organization", request.getOrganization())
         .setMediaType(MediaTypes.JSON)).content();
   }
 
@@ -224,7 +214,6 @@ public class QualitygatesService extends BaseService {
     return call(
       new GetRequest(path("search"))
         .setParam("gateId", request.getGateId())
-        .setParam("organization", request.getOrganization())
         .setParam("page", request.getPage())
         .setParam("pageSize", request.getPageSize())
         .setParam("query", request.getQuery())
@@ -243,7 +232,6 @@ public class QualitygatesService extends BaseService {
     call(
       new PostRequest(path("select"))
         .setParam("gateId", request.getGateId())
-        .setParam("organization", request.getOrganization())
         .setParam("projectId", request.getProjectId())
         .setParam("projectKey", request.getProjectKey())
         .setMediaType(MediaTypes.JSON)).content();
@@ -260,7 +248,6 @@ public class QualitygatesService extends BaseService {
     call(
       new PostRequest(path("set_as_default"))
         .setParam("id", request.getId())
-        .setParam("organization", request.getOrganization())
         .setMediaType(MediaTypes.JSON)).content();
   }
 
@@ -275,8 +262,7 @@ public class QualitygatesService extends BaseService {
     return call(
       new GetRequest(path("show"))
         .setParam("id", request.getId())
-        .setParam("name", request.getName())
-        .setParam("organization", request.getOrganization()),
+        .setParam("name", request.getName()),
       ShowWsResponse.parser());
   }
 
@@ -308,8 +294,7 @@ public class QualitygatesService extends BaseService {
         .setParam("error", request.getError())
         .setParam("id", request.getId())
         .setParam("metric", request.getMetric())
-        .setParam("op", request.getOp())
-        .setParam("organization", request.getOrganization()),
+        .setParam("op", request.getOp()),
       UpdateConditionResponse.parser());
   }
 }
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/RenameRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/RenameRequest.java
index efe0aed8ba4..883b4f138eb 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/RenameRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/RenameRequest.java
@@ -32,7 +32,6 @@ public class RenameRequest {
 
   private String id;
   private String name;
-  private String organization;
 
   /**
    * This is a mandatory parameter.
@@ -59,16 +58,4 @@ public class RenameRequest {
   public String getName() {
     return name;
   }
-
-  /**
-   * Example value: "my-org"
-   */
-  public RenameRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
 }
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/SearchRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/SearchRequest.java
index 75e54dc62c1..e3a77fb7132 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/SearchRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/SearchRequest.java
@@ -31,7 +31,6 @@ import javax.annotation.Generated;
 public class SearchRequest {
 
   private String gateId;
-  private String organization;
   private String page;
   private String pageSize;
   private String query;
@@ -51,18 +50,6 @@ public class SearchRequest {
   }
 
   /**
-   * Example value: "my-org"
-   */
-  public SearchRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Example value: "2"
    */
   public SearchRequest setPage(String page) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/SelectRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/SelectRequest.java
index 776bacc1f3f..ee09ab68a96 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/SelectRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/SelectRequest.java
@@ -31,7 +31,6 @@ import javax.annotation.Generated;
 public class SelectRequest {
 
   private String gateId;
-  private String organization;
   private String projectId;
   private String projectKey;
 
@@ -49,18 +48,6 @@ public class SelectRequest {
   }
 
   /**
-   * Example value: "my-org"
-   */
-  public SelectRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Example value: "AU-Tpxb--iU5OvuD2FLy"
    */
   public SelectRequest setProjectId(String projectId) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/SetAsDefaultRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/SetAsDefaultRequest.java
index a988a24d30e..e0ef82a3744 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/SetAsDefaultRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/SetAsDefaultRequest.java
@@ -31,7 +31,6 @@ import javax.annotation.Generated;
 public class SetAsDefaultRequest {
 
   private String id;
-  private String organization;
 
   /**
    * This is a mandatory parameter.
@@ -45,16 +44,4 @@ public class SetAsDefaultRequest {
   public String getId() {
     return id;
   }
-
-  /**
-   * Example value: "my-org"
-   */
-  public SetAsDefaultRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
 }
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/ShowRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/ShowRequest.java
index ba9e26ce4ac..58546977305 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/ShowRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/ShowRequest.java
@@ -32,7 +32,6 @@ public class ShowRequest {
 
   private String id;
   private String name;
-  private String organization;
 
   /**
    * Example value: "1"
@@ -58,15 +57,4 @@ public class ShowRequest {
     return name;
   }
 
-  /**
-   * Example value: "my-org"
-   */
-  public ShowRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
 }
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/UpdateConditionRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/UpdateConditionRequest.java
index 0e16e5d47b4..72ec766b36d 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/UpdateConditionRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/UpdateConditionRequest.java
@@ -34,7 +34,6 @@ public class UpdateConditionRequest {
   private String id;
   private String metric;
   private String op;
-  private String organization;
 
   /**
    * Example value: "10"
@@ -91,15 +90,4 @@ public class UpdateConditionRequest {
     return op;
   }
 
-  /**
-   * Example value: "my-org"
-   */
-  public UpdateConditionRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
 }
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroups/DeleteRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroups/DeleteRequest.java
index 36c900ac229..33700586137 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroups/DeleteRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroups/DeleteRequest.java
@@ -32,7 +32,6 @@ public class DeleteRequest {
 
   private String id;
   private String name;
-  private String organization;
 
   /**
    * Example value: "42"
@@ -58,16 +57,4 @@ public class DeleteRequest {
     return name;
   }
 
-  /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public DeleteRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
 }
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroups/RemoveUserRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroups/RemoveUserRequest.java
index 0d07d563dfc..ee9e1b5a666 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroups/RemoveUserRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroups/RemoveUserRequest.java
@@ -33,7 +33,6 @@ public class RemoveUserRequest {
   private String id;
   private String login;
   private String name;
-  private String organization;
 
   /**
    * Example value: "42"
@@ -70,17 +69,4 @@ public class RemoveUserRequest {
   public String getName() {
     return name;
   }
-
-  /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public RemoveUserRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
 }
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroups/UsersRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroups/UsersRequest.java
index 94e16c40d7e..cea5c013375 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroups/UsersRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroups/UsersRequest.java
@@ -32,7 +32,6 @@ public class UsersRequest {
 
   private String id;
   private String name;
-  private String organization;
   private String p;
   private String ps;
   private String q;
@@ -63,19 +62,6 @@ public class UsersRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public UsersRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Example value: "42"
    */
   public UsersRequest setP(String p) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/users/GroupsRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/users/GroupsRequest.java
index 17048aa52a8..d2996367f39 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/users/GroupsRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/users/GroupsRequest.java
@@ -31,7 +31,6 @@ import javax.annotation.Generated;
 public class GroupsRequest {
 
   private String login;
-  private String organization;
   private String p;
   private String ps;
   private String q;
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/users/SetHomepageRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/users/SetHomepageRequest.java
index 58f5aba9c3b..827a6ce468b 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/users/SetHomepageRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/users/SetHomepageRequest.java
@@ -50,7 +50,6 @@ public class SetHomepageRequest {
    * Possible values:
    * <ul>
    *   <li>"PROJECT"</li>
-   *   <li>"ORGANIZATION"</li>
    *   <li>"MY_PROJECTS"</li>
    *   <li>"MY_ISSUES"</li>
    * </ul>
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/webhooks/CreateRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/webhooks/CreateRequest.java
index 12c32c76cd2..a9a2cff8c79 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/webhooks/CreateRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/webhooks/CreateRequest.java
@@ -31,7 +31,6 @@ import javax.annotation.Generated;
 public class CreateRequest {
 
   private String name;
-  private String organization;
   private String project;
   private String secret;
   private String url;
@@ -50,19 +49,6 @@ public class CreateRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public CreateRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Example value: "my_project"
    */
   public CreateRequest setProject(String project) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/webhooks/ListRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/webhooks/ListRequest.java
index e268aeaf1f8..e55b9c5566c 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/webhooks/ListRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/webhooks/ListRequest.java
@@ -30,23 +30,9 @@ import javax.annotation.Generated;
 @Generated("sonar-ws-generator")
 public class ListRequest {
 
-  private String organization;
   private String project;
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public ListRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Example value: "my_project"
    */
   public ListRequest setProject(String project) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/webhooks/WebhooksService.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/webhooks/WebhooksService.java
index ac1a8fda3e3..cb106530e70 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/webhooks/WebhooksService.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/webhooks/WebhooksService.java
@@ -51,7 +51,6 @@ public class WebhooksService extends BaseService {
     return call(
       new PostRequest(path("create"))
         .setParam("name", request.getName())
-        .setParam("organization", request.getOrganization())
         .setParam("project", request.getProject())
         .setParam("secret", request.getSecret())
         .setParam("url", request.getUrl()),
@@ -114,7 +113,6 @@ public class WebhooksService extends BaseService {
   public ListResponse list(ListRequest request) {
     return call(
       new GetRequest(path("list"))
-        .setParam("organization", request.getOrganization())
         .setParam("project", request.getProject()),
       ListResponse.parser());
   }
diff --git a/sonar-ws/src/main/protobuf/ws-commons.proto b/sonar-ws/src/main/protobuf/ws-commons.proto
index 73a7b39b6d3..7a49f67ccb1 100644
--- a/sonar-ws/src/main/protobuf/ws-commons.proto
+++ b/sonar-ws/src/main/protobuf/ws-commons.proto
@@ -173,8 +173,3 @@ enum BranchType {
   PULL_REQUEST = 3;
   BRANCH = 4;
 }
-
-message Organization {
-  optional string key = 1;
-  optional string name = 2;
-}
diff --git a/sonar-ws/src/main/protobuf/ws-projects.proto b/sonar-ws/src/main/protobuf/ws-projects.proto
index c34ce90b4b1..523521afb43 100644
--- a/sonar-ws/src/main/protobuf/ws-projects.proto
+++ b/sonar-ws/src/main/protobuf/ws-projects.proto
@@ -64,7 +64,7 @@ message SearchWsResponse {
   repeated Component components = 2;
 
   message Component {
-    optional string organization = 1;
+    reserved 1; //drop organization
     optional string key = 3;
     optional string name = 4;
     optional string qualifier = 5;