=== 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-08 16:54:54 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/DefaultAdxDataService.java	2016-01-11 17:01:48 +0000
@@ -103,24 +103,17 @@
     // -------------------------------------------------------------------------
 
     @Autowired
-    protected DataValueSetService dataValueSetService;
-
-    @Autowired
-    protected DataValueService dataValueService;
-
-    @Autowired
-    protected DataElementService dataElementService;
-
-    @Autowired
-    protected DataElementCategoryService categoryService;
-
-    @Autowired
-    protected DataSetService dataSetService;
-    
+    private DataValueSetService dataValueSetService;
+
+    @Autowired
+    private DataValueService dataValueService;
+
+    @Autowired
+    private DataElementCategoryService categoryService;
+
     @Autowired
     private PeriodService periodService;
 
-
     @Autowired
     private IdentifiableObjectManager identifiableObjectManager;
 
@@ -579,26 +572,4 @@
 
         log.debug( "DXF attributes: " + attributes );
     }
-
-    private Map<Integer, Map<String, String>> createCatOptMap()
-    {
-        Map<Integer, Map<String, String>> catOptMap = new HashMap<>();
-
-        for ( DataElementCategoryOptionCombo coc : categoryService.getAllDataElementCategoryOptionCombos() )
-        {
-            int id = coc.getId();
-            
-            Map<String, String> categoryCodes = new HashMap<>();
-            DataElementCategoryCombo catCombo = coc.getCategoryCombo();
-            Set<DataElementCategoryOption> catOptions = coc.getCategoryOptions();
-            
-            for ( DataElementCategory category : catCombo.getCategories() )
-            {
-                categoryCodes.put( category.getCode(), category.getCategoryOption( coc ).getCode() );
-            }
-            catOptMap.put( id, categoryCodes );
-        }
-        
-        return catOptMap;
-    }
 }