=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/detargetdatavalue/DeTargetDataValue.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/detargetdatavalue/DeTargetDataValue.java	2011-01-13 09:02:15 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/detargetdatavalue/DeTargetDataValue.java	2011-01-17 09:20:40 +0000
@@ -34,7 +34,6 @@
 import org.hisp.dhis.detarget.DeTarget;
 import org.hisp.dhis.period.Period;
 import org.hisp.dhis.source.Source;
-import org.hisp.dhis.surveydatavalue.SurveyDataValue;
 
 /**
  * @author Mithilesh Kumar Thakur
@@ -130,7 +129,7 @@
             return false;
         }
 
-        if ( !(o instanceof SurveyDataValue) )
+        if ( !(o instanceof DeTargetDataValue) )
         {
             return false;
         }

=== modified file 'local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/FormAction.java'
--- local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/FormAction.java	2011-01-15 11:35:42 +0000
+++ local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/FormAction.java	2011-01-17 09:20:40 +0000
@@ -2,20 +2,14 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.dataelement.DataElementCategory;
 import org.hisp.dhis.dataelement.DataElementCategoryCombo;
 import org.hisp.dhis.dataelement.DataElementCategoryOption;
 import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-import org.hisp.dhis.dataelement.DataElementCategoryService;
-import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.dataelement.comparator.DataElementSortOrderComparator;
 import org.hisp.dhis.detarget.DeTarget;
 import org.hisp.dhis.detarget.DeTargetMember;
 import org.hisp.dhis.detarget.DeTargetService;