--- a/src/main/java/christie/codegear/CodeGear.java	Sat Feb 03 19:23:24 2018 +0900
+++ b/src/main/java/christie/codegear/CodeGear.java	Tue Feb 13 18:29:37 2018 +0900
@@ -1,7 +1,6 @@
 package christie.codegear;
 
 import christie.annotation.Peek;
-import christie.annotation.RemoteTake;
 import christie.annotation.Take;
 import christie.datagear.*;
 import christie.datagear.command.Command;
@@ -33,13 +32,10 @@
         for (Field field : this.getClass().getDeclaredFields()) {//AnnotationからInputDataGearをセット
             if (field.isAnnotationPresent(Take.class)) {
                 Take ano = field.getAnnotation(Take.class);
-                setTakeCommand("local", ano.value(), initDataGear(field, ano.value()));
+                setTakeCommand(ano.value(), field.getName(), new DataGear(field.getType()));
             } else if (field.isAnnotationPresent(Peek.class)) {
                 Peek ano = field.getAnnotation(Peek.class);
-                setPeekCommand("local", ano.value(), initDataGear(field, ano.value()));
-            } else if (field.isAnnotationPresent(RemoteTake.class)) {
-                RemoteTake ano = field.getAnnotation(RemoteTake.class);
-                setTakeCommand(ano.dgmName(), ano.key(), initDataGear(field, ano.key()));
+                setPeekCommand(ano.value(), field.getName(), new DataGear(field.getType()));
             }
             //ToDo:add remote peek
         }
@@ -47,25 +43,6 @@
         idg.finishInput(cgm, commandList);
     }
 
-    public DataGear initDataGear(Field field, String key){
-        if (!field.getName().equals(key)){
-            throw new IllegalArgumentException("key and DataGearName do not match");
-        }
-
-        DataGear dg = null;
-        try {
-            dg = (DataGear) field.get(this);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-
-        if (dg.getClazz() == null){
-            throw new NullPointerException("please initialize DataGear");
-        }
-
-        return dg;
-    }
-
     public void setTakeCommand(String toDgmName, String key, DataGear dg){
         commandList.add(new TakeCommand(this, cgm.cgmID, toDgmName, key, dg));
     }