diff --git a/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DependencyCellEditor.java b/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DependencyCellEditor.java
index 7049633..f190926 100644
--- a/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DependencyCellEditor.java
+++ b/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DependencyCellEditor.java
@@ -42,10 +42,7 @@
         }
 
         // Left-click
-        if (ddmStage.getCurState() == DependencyModelingStageStatus.IDLE &&
-                isInterfaceNode(cell) &&
-                mouseEvent.getClickCount() == 2) {
-
+        if (isInterfaceNode(cell) && mouseEvent.getClickCount() == 2) {
             showInterfaceEditDialog(cell, eventObj);
         }
     }
diff --git a/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DependencyModelingStage.java b/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DependencyModelingStage.java
index d96d090..4f63dbb 100644
--- a/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DependencyModelingStage.java
+++ b/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DependencyModelingStage.java
@@ -7,26 +7,20 @@
 import com.mxgraph.canvas.mxGraphics2DCanvas;
 import com.mxgraph.model.mxCell;
 import com.mxgraph.model.mxGeometry;
-import com.mxgraph.model.mxGraphModel;
 import com.mxgraph.swing.mxGraphComponent;
 import com.mxgraph.util.mxEventSource.mxIEventListener;
 import com.mxgraph.util.mxPoint;
 import com.mxgraph.view.mxGraph;
-import generators.JavaCodeGenerator;
-import models.Edge;
 import models.Node;
 import models.algebra.*;
 import models.controlFlowModel.*;
 import models.dataConstraintModel.Channel;
-import models.dataConstraintModel.ChannelMember;
 import models.dataConstraintModel.ResourcePath;
 import models.dataFlowModel.*;
 import models.dependencyModel.DependencyGraph;
 import models.dependencyModel.InterfaceNode;
 import models.dependencyModel.mxInterfaceShape;
 
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.util.*;
 
@@ -38,35 +32,24 @@
     
     public final int DEPENDENCY_NODE_SIZE = 50;
 
-    private DependencyModelingStageStatus curState = null;
-
     private DependencyGraph dependencyGraph = null;
 
-    private List<mxCell> nodes = new ArrayList<>();
-
     private HashMap<ResourceNode, mxCell> resNodeToCell;
     private HashMap<DataTransferChannel, mxCell> eventChannelToCell;
-
     private HashMap<mxCell, InterfaceNode> cellToInterfaceNode = new HashMap<>();
 
+    private String dependencyEdgeStyle = "strokeWidth=3;strokeColor=green;movable=false";
+
     //--------------------------------------------------
-    //　コンストラクタ
+    //　constructor
     //--------------------------------------------------
     public DependencyModelingStage(mxGraphComponent graphComponent) {
         super(graphComponent);
-        this.curState = DependencyModelingStageStatus.IDLE;
     }
 
     //--------------------------------------------------
     //　getter / setter
     //--------------------------------------------------
-    public DependencyModelingStageStatus getCurState(){
-        return curState;
-    }
-
-    public void setState(DependencyModelingStageStatus nextState){
-        curState = nextState;
-    }
 
     public InterfaceNode getInterfaceNode(mxCell cell) {
         return cellToInterfaceNode.get(cell);
@@ -78,15 +61,6 @@
 
     @Override
     public void init(Stage prevStage) {
-        /*
-        //--------------controlFlowModelingを統合出来たらこちらを採用--------------------------------
-        if (prevStage instanceof ControlFlowDelegationStage) {
-            model = ((ControlFlowDelegationStage) prevStage).getModel();
-
-            ControlFlowGraph controlFlowGraph = ((ControlFlowDelegationStage) prevStage).getControlFlowGraph();
-
-            dependencyGraph = new DependencyGraph(controlFlowGraph, model);
-        }*/
         if (prevStage instanceof PushPullSelectionStage) {
             model = prevStage.getModel();
 
@@ -350,11 +324,7 @@
                 
                 // Insert edge if both cells are found
                 if (srcCell != null && dstCell != null) {
-                    String style = "strokeWidth=3;strokeColor=green;movable=false";
-                    if (callEdge.getSelectedOption() == models.dataFlowModel.PushPullValue.PULL) {
-                        style = "strokeWidth=3;strokeColor=green;movable=false";
-                    }
-                    graph.insertEdge(layerCell, null, null, srcCell, dstCell, style);
+                    graph.insertEdge(layerCell, null, null, srcCell, dstCell, dependencyEdgeStyle);
                 }
             }
 
diff --git a/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DependencyModelingStageStatus.java b/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DependencyModelingStageStatus.java
deleted file mode 100644
index 6b202ad..0000000
--- a/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DependencyModelingStageStatus.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package application.editor.stages;
-
-public enum DependencyModelingStageStatus {
-    IDLE, //未選択状態
-    SELECT_DEPENDENCY_GRAPH, //依存関係グラフを選択中
-    SELECT_INTERFACE_NODE //Interface選択中
-}