diff --git a/com.creditease.uav.agent.buildComponent/bin/run4docker.sh b/com.creditease.uav.agent.buildComponent/bin/run4docker.sh
deleted file mode 100644
index 27d8a109..00000000
--- a/com.creditease.uav.agent.buildComponent/bin/run4docker.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-#NOT READY,PLEASE REFINE THIS
-
-UAVBASE=/app
-HOSTNAME=`hostname`
-
-working_directory=$(pwd)
-proc_watcher="yes"
-if [ "$1" == "--no-watch" ]; then
-    proc_watcher="no" 
-    shift 
-fi 
-
-echo $4
-executeJava="java"
-jhome=""
-if [ -d "$4" ]; then
-    export JAVA_HOME=$4
-    export JRE_HOME=$JAVA_HOME/jre 
-    export PATH=$JAVA_HOME/bin:$PATH 
-    export CLASSPATH=.:$JAVA_HOME/lib:$JRE_HOME/lib:$CLASSPATH
-    jhome=$4
-fi
-
-if [ -z $jhome ];then
-javaHomeArray=(/opt/jdk1.7.0_45 /opt/jdk1.7.0_65 /opt/jdk1.7.0_71 /opt/jdk1.7.0_79 /opt/jdk1.7.0_80 /opt/jdk1.8.0_77 /opt/jdk1.8.0_121 /opt/jdk1.8.0_131 /app/jdk1.7.0_79 /app/jdk1.7.0_80)
-for jhome in ${javaHomeArray[@]}
-do
-    tmp="$jhome/bin/java"
-    if [ -x "$tmp" ]; then
-        executeJava=$tmp        
-        break
-    fi
-done
-fi
-
-echo "using $executeJava"
-
-netcardIndex=
-netcardName=
-if [ $# -gt 2 ]; then
-    if [[ $3 =~ ^[0-9]$ ]]; then 
-        netcardIndex=$3
-    else
-        netcardName=$3
-    fi
-fi
-
-cd .. 
-export CLASSPATH=$UAVBASE/uav/uavagent/bin/com.creditease.uav.base-1.0-boot.jar 
-echo $CLASSPATH
-
-echo "127.0.0.1 $HOSTNAME">>/etc/hosts
- 
-javaAgent="-javaagent:$UAVBASE/uav/uavmof/com.creditease.uav.agent/com.creditease.uav.monitorframework.agent-1.0-agent.jar"
-javaOpts="-server -Xms64m -Xmx256m -Xss256k -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:+CMSIncrementalPacing -XX:CMSIncrementalDutyCycleMin=0 -XX:CMSIncrementalDutyCycle=10 -XX:+UseParNewGC -XX:+UseCMSCompactAtFullCollection -XX:-CMSParallelRemarkEnabled -XX:CMSFullGCsBeforeCompaction=0 -XX:CMSInitiatingOccupancyFraction=70 -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=." 
-$executeJava $javaAgent $javaOpts -XX:OnOutOfMemoryError='kill -9 %p' -DNetCardIndex=$netcardIndex -DNetCardName=$netcardName -DJAppID=$2 -DDeploymentType=container -classpath $CLASSPATH com.creditease.mscp.boot.MSCPBoot -p $1
\ No newline at end of file
diff --git a/com.creditease.uav.agent.buildComponent/bin/run4k8s.sh b/com.creditease.uav.agent.buildComponent/bin/run4k8s.sh
deleted file mode 100644
index 4da3edfc..00000000
--- a/com.creditease.uav.agent.buildComponent/bin/run4k8s.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-#NOT READY,PLEASE REFINE THIS
-
-UAVBASE=/app
-
-working_directory=$(pwd)
-proc_watcher="yes"
-if [ "$1" == "--no-watch" ]; then
-    proc_watcher="no" 
-    shift 
-fi 
-
-echo $4
-executeJava="java"
-jhome=""
-if [ -d "$4" ]; then
-    export JAVA_HOME=$4
-    export JRE_HOME=$JAVA_HOME/jre 
-    export PATH=$JAVA_HOME/bin:$PATH 
-    export CLASSPATH=.:$JAVA_HOME/lib:$JRE_HOME/lib:$CLASSPATH
-    jhome=$4
-fi
-
-if [ -z $javaHome ];then
-javaHomeArray=(/opt/jdk1.7.0_45 /opt/jdk1.7.0_65 /opt/jdk1.7.0_71 /opt/jdk1.7.0_79 /opt/jdk1.7.0_80 /opt/jdk1.8.0_77 /opt/jdk1.8.0_121 /opt/jdk1.8.0_131 /app/jdk1.7.0_79 /app/jdk1.7.0_80)
-for jhome in ${javaHomeArray[@]}
-do
-    tmp="$jhome/bin/java"
-    if [ -x "$tmp" ]; then
-        executeJava=$tmp
-        break
-    fi
-done
-fi
-
-netcardIndex=
-netcardName=
-if [ $# -gt 2 ]; then
-    if [[ $3 =~ ^[0-9]$ ]]; then 
-        netcardIndex=$3
-    else
-        netcardName=$3
-    fi
-fi
-
-cd .. 
-export CLASSPATH=$UAVBASE/uav/uavagent/bin/com.creditease.uav.base-1.0-boot.jar 
-echo $CLASSPATH
- 
-javaAgent="-javaagent:$UAVBASE/uav/uavmof/com.creditease.uav.agent/com.creditease.uav.monitorframework.agent-1.0-agent.jar"
-javaOpts="-server -Xms64m -Xmx256m -Xss256k -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:+CMSIncrementalPacing -XX:CMSIncrementalDutyCycleMin=0 -XX:CMSIncrementalDutyCycle=10 -XX:+UseParNewGC -XX:+UseCMSCompactAtFullCollection -XX:-CMSParallelRemarkEnabled -XX:CMSFullGCsBeforeCompaction=0 -XX:CMSInitiatingOccupancyFraction=70 -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=." 
-$executeJava $javaAgent $javaOpts -XX:OnOutOfMemoryError='kill -9 %p' -DNetCardIndex=$netcardIndex -DNetCardName=$netcardName -DJAppID=$2 -DDeploymentType=container -classpath $CLASSPATH com.creditease.mscp.boot.MSCPBoot -p $1 
\ No newline at end of file
diff --git a/com.creditease.uav.agent.buildComponent/bin/start_ma_pro_docker.sh b/com.creditease.uav.agent.buildComponent/bin/start_ma_pro_docker.sh
deleted file mode 100644
index cf672fe9..00000000
--- a/com.creditease.uav.agent.buildComponent/bin/start_ma_pro_docker.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh 
-UAVBASE=/app
-cd $UAVBASE/uav/uavagent/bin/ 
-nohup run4docker.sh ma_pro MonitorAgent $1 $2
\ No newline at end of file
diff --git a/com.creditease.uav.agent.buildComponent/bin/start_ma_pro_k8s.sh b/com.creditease.uav.agent.buildComponent/bin/start_ma_pro_k8s.sh
deleted file mode 100644
index 435f0b1b..00000000
--- a/com.creditease.uav.agent.buildComponent/bin/start_ma_pro_k8s.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh 
-chmod +x *
-UAVBASE=/app
-cd $UAVBASE/uav/uavagent/bin/
-/bin/sh run4k8s.sh ma_pro MonitorAgent $1 $2
\ No newline at end of file
diff --git a/com.creditease.uav.agent.buildComponent/bin/start_ma_test_docker.sh b/com.creditease.uav.agent.buildComponent/bin/start_ma_test_docker.sh
deleted file mode 100644
index ec7de4c3..00000000
--- a/com.creditease.uav.agent.buildComponent/bin/start_ma_test_docker.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh 
-chmod +x *
-UAVBASE=/app
-cd $UAVBASE/uav/uavagent/bin/ 
-/bin/sh run4docker.sh ma_test MonitorAgent $1 $2
\ No newline at end of file
diff --git a/com.creditease.uav.agent.buildComponent/bin/start_ma_test_k8s.sh b/com.creditease.uav.agent.buildComponent/bin/start_ma_test_k8s.sh
deleted file mode 100644
index 43687525..00000000
--- a/com.creditease.uav.agent.buildComponent/bin/start_ma_test_k8s.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh 
-chmod +x *
-UAVBASE=/app
-cd $UAVBASE/uav/uavagent/bin/ 
-/bin/sh run4k8s.sh ma_test MonitorAgent $1 $2
\ No newline at end of file
diff --git a/com.creditease.uav.healthmanager/src/main/java/com/creditease/uav/feature/healthmanager/datastore/adaptors/NodeInfoDataAdapter.java b/com.creditease.uav.healthmanager/src/main/java/com/creditease/uav/feature/healthmanager/datastore/adaptors/NodeInfoDataAdapter.java
index fa7af6c0..abfdda46 100644
--- a/com.creditease.uav.healthmanager/src/main/java/com/creditease/uav/feature/healthmanager/datastore/adaptors/NodeInfoDataAdapter.java
+++ b/com.creditease.uav.healthmanager/src/main/java/com/creditease/uav/feature/healthmanager/datastore/adaptors/NodeInfoDataAdapter.java
@@ -25,8 +25,11 @@
 import java.util.List;
 import java.util.Map;
 
+import org.aredis.cache.StringHandler;
+
 import com.creditease.agent.helpers.DataStoreHelper;
 import com.creditease.agent.helpers.JSONHelper;
+import com.creditease.agent.helpers.StringHelper;
 import com.creditease.agent.monitor.api.MonitorDataFrame;
 import com.creditease.uav.datastore.api.DataStoreAdapter;
 import com.creditease.uav.datastore.api.DataStoreConnection;
@@ -196,8 +199,8 @@ private Map<String, String> createTags(MonitorDataFrame mdf, String instanceId,
         }
         else if (meId.indexOf("procState") == 0) {
             String temp[] = instanceId.split("_");
-            if ((temp[1].equals("java") || temp[1].equals("javaw.exe") || temp[1].equals("java.exe"))
-                    && fields.get("main") != null) {
+            if (("java".equals(temp[1]) || "javaw.exe".equals(temp[1]) || "java.exe".equals(temp[1]))
+                    && !StringHelper.isEmpty((String)fields.get("main"))) {
 
                 String mainClass = (String) fields.get("main");
                 // group Id :for java, pgid is main class