diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/Injectable.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/Injectable.java
index fe9317f1e..ec2cdda64 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/Injectable.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/Injectable.java
@@ -1,7 +1,8 @@
 package org.skywalking.apm.agent.core.context;
 
 /**
- * The <code>Injectable</code> represents a callback
+ * The <code>Injectable</code> represents a provider, which gives the reference of {@link ContextCarrier} and peer
+ * for the agent core, for cross-process propagation.
  *
  * @author wusheng
  */
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/tag/AbstractTag.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/tag/AbstractTag.java
index 7c40949e5..a15adcf62 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/tag/AbstractTag.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/tag/AbstractTag.java
@@ -2,16 +2,6 @@ package org.skywalking.apm.agent.core.context.tag;
 
 import org.skywalking.apm.agent.core.context.trace.AbstractSpan;
 
-/**
- * This is the abstract tag.
- * All span's tags inherit from {@link AbstractTag},
- * which provide an easy way to
- * {@link Span#setTag(String, String)} ,
- * {@link Span#setTag(String, Integer)}
- * {@link Span#setTag(String, boolean)} ,
- * <p>
- * Created by wusheng on 2017/2/17.
- */
 public abstract class AbstractTag<T> {
     /**
      * The key of this Tag.
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/tag/Tags.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/tag/Tags.java
index 725a3b8a8..6e924850e 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/tag/Tags.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/tag/Tags.java
@@ -22,21 +22,6 @@ public final class Tags {
      */
     public static final StringTag STATUS_CODE = new StringTag("status_code");
 
-    /**
-     * SPAN_KIND hints at the relationship between spans, e.g. client/server.
-     */
-    public static final StringTag SPAN_KIND = new StringTag("span.kind");
-
-    /**
-     * A constant for setting the span kind to indicate that it represents a server span.
-     */
-    public static final String SPAN_KIND_SERVER = "server";
-
-    /**
-     * A constant for setting the span kind to indicate that it represents a client span.
-     */
-    public static final String SPAN_KIND_CLIENT = "client";
-
     /**
      * SPAN_LAYER represents the kind of span.
      * <p>
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/dictionary/DictionaryUtil.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/dictionary/DictionaryUtil.java
index 8a0758cb5..d04e36adb 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/dictionary/DictionaryUtil.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/dictionary/DictionaryUtil.java
@@ -5,14 +5,10 @@ package org.skywalking.apm.agent.core.dictionary;
  */
 public class DictionaryUtil {
     public static int nullValue() {
-        return -1;
+        return 0;
     }
 
-    public static boolean isNull(int value) {
-        return value == nullValue();
-    }
-
-    public static boolean isNull(String text) {
-        return text == null;
+    public static boolean isNull(int id) {
+        return id == nullValue();
     }
 }
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/dictionary/DictionaryValueHolder.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/dictionary/DictionaryValueHolder.java
deleted file mode 100644
index d02eae589..000000000
--- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/dictionary/DictionaryValueHolder.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.skywalking.apm.agent.core.dictionary;
-
-/**
- * @author wusheng
- */
-public class DictionaryValueHolder {
-    private int value = DictionaryUtil.nullValue();
-
-    public int getValue() {
-        return value;
-    }
-
-    public void setValue(int value) {
-        this.value = value;
-    }
-}