=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/ReportExcelOganiztionGroupListing.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/ReportExcelOganiztionGroupListing.java	2009-10-16 12:26:29 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/ReportExcelOganiztionGroupListing.java	2009-10-17 18:36:07 +0000
@@ -28,11 +28,8 @@
 package org.hisp.dhis.reportexcel;
 
 import java.util.List;
-import java.util.Set;
 
-import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
-import org.hisp.dhis.user.UserAuthorityGroup;
 
 /**
  * @author Chau Thu Tran

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoption/ValidateDataElementCategoryOptionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoption/ValidateDataElementCategoryOptionAction.java	2009-10-16 13:09:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoption/ValidateDataElementCategoryOptionAction.java	2009-10-17 18:36:07 +0000
@@ -76,13 +76,6 @@
         this.name = name;
     }
 
-    private String shortName;
-
-    public void setShortName( String shortName )
-    {
-        this.shortName = shortName;
-    }
-
     // -------------------------------------------------------------------------
     // Output
     // -------------------------------------------------------------------------