diff --git a/src/org/ntlab/traceDebugger/Variable.java b/src/org/ntlab/traceDebugger/Variable.java
index 7ba0c08..0156d8d 100644
--- a/src/org/ntlab/traceDebugger/Variable.java
+++ b/src/org/ntlab/traceDebugger/Variable.java
@@ -14,7 +14,6 @@
 import org.eclipse.jdt.core.JavaModelException;
 import org.ntlab.traceAnalysisPlatform.tracer.trace.ArrayUpdate;
 import org.ntlab.traceAnalysisPlatform.tracer.trace.FieldUpdate;
-import org.ntlab.traceAnalysisPlatform.tracer.trace.TraceJSON;
 import org.ntlab.traceAnalysisPlatform.tracer.trace.TracePoint;
 import org.ntlab.traceDebugger.analyzerProvider.VariableUpdatePointFinder;
 
@@ -152,36 +151,6 @@
 		return variableName + ": " + valueClassName + "(" + "id = " + valueId + ")";
 	}
 	
-//	/**
-//	 * ���̃t�B�[���h���Q�ƌ^�I�u�W�F�N�g���z�񂩂𔻒肵�Ĕ��茋�ʂ�Ԃ�.<br>
-//	 * (�ϐ��r���[�ɕ\��������f�[�^���ċA�I�ɋ��߂邽�߂�, �Ăяo�����Ŏ��ɂǂ̃��\�b�h���ĂԂ��𔻒f����̂ɗ��p)
-//	 * 
-//	 * @param objData
-//	 * @return FIELD: �Q�ƌ^�I�u�W�F�N�g�̏ꍇ, ARRAY: �z��̏ꍇ, NONE: ����ȊO�̏ꍇ
-//	 */
-//	private DeepHierarchy checkDeepHierarchy() {
-//		// note: �t�B�[���h��ID��Type���Ȃ��ꍇ��AType(=ActualType)��"---"�̏ꍇ�͉������Ȃ�
-//		if (this.getValueId() == null || this.getValueId().isEmpty() 
-//				|| this.getValueClassName() == null || this.getValueClassName().isEmpty()) {
-//			return DeepHierarchy.NONE;
-//		}
-//		final String NULL_ACTUAL_TYPE = "---"; // �t�B�[���h�ɑ΂��Ė����I��null����ꂽ�ꍇ��ActualType�̎擾������
-//		if (this.getValueClassName().equals(NULL_ACTUAL_TYPE)) return DeepHierarchy.NONE;
-//
-//		final String ARRAY_SIGNATURE_HEAD = "["; // �z��̃V�O�l�`���̐擪�́A�z��̎��������� [ ���A�Ȃ�
-//		if (this.getValueClassName().startsWith(ARRAY_SIGNATURE_HEAD)) {
-//			// note: �t�B�[���h��Type���z��^(�@[ �Ŏn�܂�@)�ꍇ (���̔z�񂪎��Še�v�f�ɂ‚��Ă���Ȃ�f�[�^�擾�������Ăяo��)
-//			return DeepHierarchy.ARRAY;
-//		} else {
-//			String[] primitives = {"byte", "short", "int", "long", "float", "double", "char", "boolean"};
-//			if (!Arrays.asList(primitives).contains(this.getValueClassName())) {
-//				// note: �t�B�[���h��Type���Q�ƌ^(=�I�u�W�F�N�g)�̏ꍇ (���̃I�u�W�F�N�g�������Ă���t�B�[���h�ɂ‚��Ă���Ȃ�f�[�^�擾�������Ăяo��)
-//				return DeepHierarchy.FIELD;
-//			}
-//		}
-//		return DeepHierarchy.NONE;
-//	}
-	
 	/**
 	 * ���̃t�B�[���h���Q�ƌ^�I�u�W�F�N�g���z�񂩂𔻒肵�Ĕ��茋�ʂ�Ԃ�.<br>
 	 * (�ϐ��r���[�ɕ\��������f�[�^���ċA�I�ɋ��߂邽�߂�, �Ăяo�����Ŏ��ɂǂ̃��\�b�h���ĂԂ��𔻒f����̂ɗ��p)
@@ -198,11 +167,9 @@
 		}		
 		
 		final String NULL_ACTUAL_TYPE = "---"; // �t�B�[���h�ɑ΂��Ė����I��null����ꂽ�ꍇ��ActualType�̎擾������
-//		if (this.getValueClassName().equals(NULL_ACTUAL_TYPE)) return DeepHierarchy.NONE;
 		if (className.equals(NULL_ACTUAL_TYPE)) return DeepHierarchy.NONE;
 
 		final String ARRAY_SIGNATURE_HEAD = "["; // �z��̃V�O�l�`���̐擪�́A�z��̎��������� [ ���A�Ȃ�
-//		if (this.getValueClassName().startsWith(ARRAY_SIGNATURE_HEAD)) {
 		if (className.startsWith(ARRAY_SIGNATURE_HEAD)) {
 			// note: �t�B�[���h��Type���z��^(�@[ �Ŏn�܂�@)�ꍇ (���̔z�񂪎��Še�v�f�ɂ‚��Ă���Ȃ�f�[�^�擾�������Ăяo��)
 			return DeepHierarchy.ARRAY;
@@ -299,28 +266,19 @@
 				String fullyQualifiedFieldName = field.getDeclaringType().getFullyQualifiedName() + "." + field.getElementName(); // ���S����N���X��
 				
 				// ���̃t�B�[���h�ɂ‚��Ă̍ŐV�̍X�V�����擾(FieldUpdate)
-				TraceJSON trace = (TraceJSON)TraceDebuggerPlugin.getAnalyzer().getTrace();
-//				FieldUpdate fieldUpdate = trace.getRecentlyFieldUpdate(thisObjData.getId(), fieldName, tp);
-//				FieldUpdate fieldUpdate = trace.getFieldUpdate(id, fullyQualifiedFieldName, before, isReturned);
-				
-//				TracePoint updateTracePoint = trace.getFieldUpdateTracePoint(valueId, fullyQualifiedFieldName, before, isReturned);
 				String nextContainerId = (variableType.isContainerSide()) ? containerId : valueId;
 				String nextClassName = (variableType.isContainerSide()) ? containerClassName : valueClassName;
-//				TracePoint updateTracePoint = VariableUpdatePointFinder.getInstance().getPoint(valueId, fullyQualifiedFieldName, before);
 				TracePoint updateTracePoint = VariableUpdatePointFinder.getInstance().getPoint(nextContainerId, fullyQualifiedFieldName, before);
-				
-//				if (updateTracePoint == null) continue;
 				if (updateTracePoint != null) {
 					FieldUpdate fieldUpdate = (FieldUpdate)updateTracePoint.getStatement();
 					// �t�B�[���h��ID��Type���擾(String)
 					String nextValueId = (fieldUpdate != null) ? fieldUpdate.getValueObjId() : "---";
 					String nextValueClassName  = (fieldUpdate != null) ? fieldUpdate.getValueClassName() : NULL_VALUE;
-//					Variable fieldData = new Variable(fieldName, fullyQualifiedFieldName, valueClassName, valueId, fieldType, fieldObjId, updateTracePoint, before, isReturned, VariableType.USE_VALUE);
 					Variable fieldData = new Variable(fieldName, fullyQualifiedFieldName, nextClassName, nextContainerId, nextValueClassName, nextValueId, updateTracePoint, before, isReturned, VariableType.USE_VALUE);
 					this.addChild(fieldData);
 				} else {
 					Variable fieldData = new Variable(fieldName, fullyQualifiedFieldName, valueClassName, valueId, NULL_VALUE, "---", updateTracePoint, before, isReturned, VariableType.USE_VALUE);
-					this.addChild(fieldData);					
+					this.addChild(fieldData);
 				}
 			}
 		} catch (JavaModelException e) {
@@ -349,26 +307,6 @@
 		}
 	}
 	
-//	private void getArrayState() {
-//		TraceJSON trace = (TraceJSON)TraceDebuggerPlugin.getAnalyzer().getTrace();
-//		for (int i = 0;; i++){
-//			// ���̔z��v�f�ɂ‚��Ă̍ŐV�̍X�V�����擾(ArrayUpdate)
-//			ArrayUpdate arrayUpdate = trace.getRecentlyArrayUpdate(valueId, i, before);
-//			if (arrayUpdate == null) {
-//				// �z��̃T�C�Y���擾�ł��Ȃ����߁A�C���f�b�N�X���T�C�Y���߂̂Ƃ��Ɋm���ɔ���������@�Ƃ��ĉ�����
-//				// �������A�z��v�f�̓r���ɖ���`���������ꍇ�ł��A�����Ă��܂��̂����_
-//				break;
-//			}
-//			String arrayIndexName = variableName + "[" + i + "]";
-//			
-//			// �z��v�f��ID��Type���擾(String)
-//			String valueObjId = arrayUpdate.getValueObjectId();
-//			String valueType = arrayUpdate.getValueClassName();
-//			Variable arrayIndexData = new Variable(arrayIndexName, valueClassName, valueId, valueType, valueObjId, before, isReturned);
-//			this.addChild(arrayIndexData);
-//		}
-//	}
-	
 	public void addAdditionalAttribute(String key, Object value) {
 		additionalAttributes.put(key, value);
 	}