diff --git a/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/LogAlgorithmForPathMergeVertex.java b/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/LogAlgorithmForPathMergeVertex.java
index 4a57657..fa77d43 100644
--- a/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/LogAlgorithmForPathMergeVertex.java
+++ b/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/LogAlgorithmForPathMergeVertex.java
@@ -301,10 +301,10 @@
 		else{
 			if(getVertexValue().getState() != State.START_VERTEX 
 					&& getVertexValue().getState() != State.END_VERTEX && getVertexValue().getState() != State.FINAL_DELETE){
-				vertexVal.setState(State.KILL_SELF);
-				setVertexValue(vertexVal);
-				voteToHalt();
-				//deleteVertex(getVertexId());//killSelf because it doesn't receive any message
+				//vertexVal.setState(State.KILL_SELF);
+				//setVertexValue(vertexVal);
+				//voteToHalt();
+				deleteVertex(getVertexId());//killSelf because it doesn't receive any message
 			}
 		}
 	}
@@ -341,9 +341,10 @@
 			}
 			else if(getSuperstep()%3 == 2 && getSuperstep() <= maxIteration){
 				if(vertexVal.getState() == State.TODELETE){ //|| vertexVal.getState() == State.KILL_SELF)
-					vertexVal.setState(State.NON_EXIST);
-					setVertexValue(vertexVal);
-					voteToHalt(); //killSelf  deleteVertex(getVertexId());
+					//vertexVal.setState(State.NON_EXIST);
+					//setVertexValue(vertexVal);
+					//voteToHalt();
+					deleteVertex(getVertexId()); //killSelf  
 				}
 				else{
 					mergeChainVertex(msgIterator);
diff --git a/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/NaiveAlgorithmForPathMergeVertex.java b/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/NaiveAlgorithmForPathMergeVertex.java
index f2e8688..8a70bd5 100644
--- a/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/NaiveAlgorithmForPathMergeVertex.java
+++ b/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/NaiveAlgorithmForPathMergeVertex.java
@@ -138,8 +138,9 @@
 			if(GraphVertexOperation.isPathVertex(vertexVal.getAdjMap())){
 				chainVertexId = kmerFactory.mergeKmerWithNextCode(msg.getChainVertexId(),
 						vertexId.getGeneCodeAtPosition(kmerSize - 1));
-				vertexVal.setState(State.NON_EXIST); //deleteVertex(getVertexId());
-				setVertexValue(vertexVal);
+				deleteVertex(getVertexId());
+				//vertexVal.setState(State.NON_EXIST); 
+				//setVertexValue(vertexVal);
 				msg.set(vertexId, chainVertexId, msg.getHeadVertexId(), vertexVal.getAdjMap(), false);
 				sendMsg(destVertexId,msg);
 			}
