=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/translation/Translation.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/translation/Translation.java	2016-01-11 15:29:32 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/translation/Translation.java	2016-01-11 17:18:24 +0000
@@ -60,9 +60,17 @@
 
     public Translation()
     {
-
     }
 
+    /**
+     * TODO find some consistent order across object, service, HBM.
+     * 
+     * @param className the class name of the translated object.
+     * @param locale the locale.
+     * @param property the property name.
+     * @param value the translation.
+     * @param objectUid the UID of the translated object.
+     */
     public Translation( String className, String locale, String property, String value, String objectUid )
     {
         this.className = className;

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/DefaultAdxDataService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/DefaultAdxDataService.java	2016-01-11 17:01:48 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/DefaultAdxDataService.java	2016-01-11 17:18:24 +0000
@@ -44,12 +44,8 @@
 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.dataset.DataSet;
-import org.hisp.dhis.dataset.DataSetService;
 import org.hisp.dhis.datavalue.DataValue;
 import org.hisp.dhis.datavalue.DataValueService;
 import org.hisp.dhis.dxf2.common.ImportOptions;
@@ -109,9 +105,6 @@
     private DataValueService dataValueService;
 
     @Autowired
-    private DataElementCategoryService categoryService;
-
-    @Autowired
     private PeriodService periodService;
 
     @Autowired
@@ -186,12 +179,8 @@
 
             DataElementCategoryCombo categoryCombo = dataSet.getCategoryCombo();
 
-            List<DataElementCategory> categories = categoryCombo.getCategories();
-
             for ( DataElementCategoryOptionCombo aoc : categoryCombo.getOptionCombos() )
-            {
-                Set<DataElementCategoryOption> catopts = aoc.getCategoryOptions();
-                
+            {                
                 Map<String, String> attributeDimensions = metadata.getExplodedCategoryAttributes(aoc.getId());
                 
                 for ( OrganisationUnit orgUnit : params.getOrganisationUnits() )