=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java	2009-09-25 21:45:01 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java	2009-09-25 21:50:41 +0000
@@ -31,7 +31,6 @@
 import java.util.Set;
 
 import org.hisp.dhis.dataset.DataSet;
-import org.hisp.dhis.reportexcel.ReportExcel;
 
 /**
  * @author Nguyen Hong Duc

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/DefaultExpressionService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/DefaultExpressionService.java	2009-09-25 21:45:01 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/DefaultExpressionService.java	2009-09-25 21:50:41 +0000
@@ -47,7 +47,6 @@
 import org.hisp.dhis.dataelement.DataElementCategoryOptionComboService;
 import org.hisp.dhis.dataelement.DataElementService;
 import org.hisp.dhis.dataelement.Operand;
-import org.hisp.dhis.datavalue.DataValue;
 import org.hisp.dhis.datavalue.DataValueService;
 import org.hisp.dhis.period.Period;
 import org.hisp.dhis.source.Source;
@@ -416,8 +415,6 @@
                 final DataElementCategoryOptionCombo categoryOptionCombo = 
                     categoryOptionComboService.getDataElementCategoryOptionCombo( operand.getOptionComboId() );
 
-                //final DataValue dataValue = dataValueService.getDataValue( source, dataElement, period, categoryOptionCombo );
-
                 final String value = dataValueService.getValue( dataElement, period, source, categoryOptionCombo );
                 
                 if ( value == null && nullIfNoValues )

=== modified file 'dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/DefaultReportExcelService.java'
--- dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/DefaultReportExcelService.java	2009-09-25 21:45:01 +0000
+++ dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/DefaultReportExcelService.java	2009-09-25 21:50:41 +0000
@@ -26,7 +26,6 @@
  */
 package org.hisp.dhis.reportexcel;
 
-import java.util.ArrayList;
 import java.util.Collection;
 
 import org.hisp.dhis.dataset.DataSet;
@@ -34,9 +33,6 @@
 import org.hisp.dhis.period.Period;
 import org.hisp.dhis.reportexcel.status.DataEntryStatus;
 import org.hisp.dhis.user.User;
-import org.hisp.dhis.user.UserAuthorityGroup;
-import org.hisp.dhis.user.UserCredentials;
-import org.hisp.dhis.user.UserStore;
 import org.springframework.transaction.annotation.Transactional;
 
 /**

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/resourceTableForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/resourceTableForm.vm	2009-09-17 16:08:23 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/resourceTableForm.vm	2009-09-25 21:50:41 +0000
@@ -18,7 +18,7 @@
 
 <p>
     <input type="checkbox" id="categoryOptionComboName">
-    <label for="groupSet">$i18n.getString( "data_element_category_option_combo_name" ) <span style="color:#606060">(orgunitgroupsetstructure)</span></label>
+    <label for="groupSet">$i18n.getString( "data_element_category_option_combo_name" ) <span style="color:#606060">(categoryoptioncomboname)</span></label>
 </p>
 
 <p>