diff --git a/CHANGES.md b/CHANGES.md
index 3f293834a5..8ebee84964 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -7,19 +7,9 @@ Release Notes.
 
 #### Project
 
-* Upgrade jdk 11 in dockerfile and remove unused java_opts.
-* DataCarrier changes a `#consume` API to add properties as a parameter to initialize consumer when
-  use `Class<? extends IConsumer<T>> consumerClass`.
+* Split javaagent into skywalking-java repository. https://github.com/apache/skywalking-java
 
-#### Java Agent
-
-* Support Multiple DNS period resolving mechanism
-* Modify `Tags.STATUS_CODE` field name to `Tags.HTTP_RESPONSE_STATUS_CODE` and type from `StringTag` to `IntegerTag`, add `Tags.RPC_RESPONSE_STATUS_CODE` field to hold rpc response code value.
-* Fix kafka-reporter-plugin shade package conflict
-* Add all config items to `agent.conf` file for convenient containerization use cases.
-* Advanced Kafka Producer configuration enhancement.
-
-#### OAP-Backend
+#### OAP Server
 
 * Fix CVE-2021-35515, CVE-2021-35516, CVE-2021-35517, CVE-2021-36090. Upgrade org.apache.commons:commons-compress to
   1.21.
diff --git a/docs/en/guides/How-to-build.md b/docs/en/guides/How-to-build.md
index 66a472efe0..35c6b04729 100644
--- a/docs/en/guides/How-to-build.md
+++ b/docs/en/guides/How-to-build.md
@@ -48,16 +48,6 @@ For each official Apache release, there is a complete and independent source cod
 ### Advanced compiling
 SkyWalking is a complex maven project that has many modules. Therefore, the time to compile may be a bit longer than usual.
 If you just want to recompile part of the project, you have the following options:
-- Compile agent and package
->  ./mvnw package -Pagent,dist
-
-or
-
-> make build.agent
-
-If you intend to compile a single plugin, such as one in the dev stage, you could
->  cd plugin_module_dir & mvn clean package
-
 - Compile backend and package
 >  ./mvnw package -Pbackend,dist
 
@@ -65,6 +55,9 @@ or
 
 > make build.backend
 
+If you intend to compile a single plugin, such as one in the dev stage, you could
+>  cd plugin_module_dir & mvn clean package
+
 - Compile UI and package
 >  ./mvnw package -Pui,dist
 
diff --git a/docs/menu.yml b/docs/menu.yml
index 0c61f2ee7e..39d534c7f1 100644
--- a/docs/menu.yml
+++ b/docs/menu.yml
@@ -57,66 +57,6 @@ catalog:
 
   - name: "Setup"
     catalog:
-      - name: "Java agent"
-        catalog:
-        - name: "Setup"
-          path: "/en/setup/service-agent/java-agent/readme"
-        - name: "Setup in Docker"
-          path: "/en/setup/service-agent/java-agent/containerization#docker"
-        - name: "Setup in Kubernetes"
-          path: "/en/setup/service-agent/java-agent/containerization#kubernetes"
-        - name: "Supported middleware, framework and library"
-          path: "/en/setup/service-agent/java-agent/Supported-list"
-        - name: "Agent Configuration Properties"
-          path: "/en/setup/service-agent/java-agent/configurations#table-of-agent-configuration-properties"
-        - name: "Dynamic Configurations"
-          path: "/en/setup/service-agent/java-agent/configurations#dynamic-configurations"
-        - name: "Optional Plugins"
-          path: "/en/setup/service-agent/java-agent/readme#optional-plugins"
-        - name: "Bootstrap/JVM class plugin"
-          path: "/en/setup/service-agent/java-agent/readme#bootstrap-class-plugins"
-        - name: "Logic Endpoint"
-          path: "/en/setup/service-agent/java-agent/logic-endpoint"
-        - name: "Advanced Features"
-          catalog:
-            - name: "Guidance"
-              path: "/en/setup/service-agent/java-agent/advanced-features"
-            - name: "Setting Override"
-              path: "/en/setup/service-agent/java-agent/setting-override"
-            - name: "Transport Layer Security (TLS)"
-              path: "/en/setup/service-agent/java-agent/tls"
-            - name: "Namespace Isolation"
-              path: "/en/setup/service-agent/java-agent/namespace"
-            - name: "Token Authentication"
-              path: "/en/setup/service-agent/java-agent/token-auth"
-            - name: "Manual APIs"
-              catalog:
-                - name: "Tracing APIs"
-                  path: "/en/setup/service-agent/java-agent/application-toolkit-trace"
-                - name: "OpenTracing Tracer"
-                  path: "/en/setup/service-agent/java-agent/opentracing"
-                - name: "Meter APIs"
-                  path: "/en/setup/service-agent/java-agent/application-toolkit-meter"
-                - name: "Across Thread Solution"
-                  path: "/en/setup/service-agent/java-agent/application-toolkit-trace-cross-thread"
-                - name: "MicroMeter Registry"
-                  path: "/en/setup/service-agent/java-agent/application-toolkit-micrometer"
-            - name: "Tolerate Custom Exceptions"
-              path: "/en/setup/service-agent/java-agent/how-to-tolerate-exceptions"
-            - name: "Log & Trace Correlation"
-              catalog:
-                - name: "Log4j"
-                  path: "/en/setup/service-agent/java-agent/application-toolkit-log4j-1.x"
-                - name: "Log4j2"
-                  path: "/en/setup/service-agent/java-agent/application-toolkit-log4j-2.x"
-                - name: "Logback"
-                  path: "/en/setup/service-agent/java-agent/application-toolkit-logback-1.x/"
-        - name: "Advanced reporters"
-          path: "/en/setup/service-agent/java-agent/advanced-reporters"
-        - name: "Plugin development guide"
-          path: "/en/guides/java-plugin-development-guide/"
-        - name: "Java Agent Performance Test"
-          path: "https://skyapmtest.github.io/Agent-Benchmarks/"
       - name: "Server Agents"
         path: "/en/setup/service-agent/server-agents"
       - name: "Browser Agent"