=== modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.java'
--- dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.java	2010-12-04 00:03:38 +0000
+++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.java	2010-12-04 00:05:04 +0000
@@ -233,26 +233,6 @@
         // ---------------------------------------------------------------------
         // Filter and get operands
         // ---------------------------------------------------------------------
-
-        /*
-        final Collection<Integer> nonCalculatedDataElementIds = ConversionUtils.getIdentifiers( DataElement.class, nonCalculatedDataElements );
-        final Set<Integer> dataElementInIndicatorIds = getDataElementIdsInIndicators( indicators );
-        final Set<Integer> dataElementInCalculatedDataElementIds = getDataElementIdsInCalculatedDataElements( calculatedDataElements );
-
-        final Set<Integer> allDataElementIds = new HashSet<Integer>();
-        allDataElementIds.addAll( nonCalculatedDataElementIds );
-        allDataElementIds.addAll( dataElementInIndicatorIds );
-        allDataElementIds.addAll( dataElementInCalculatedDataElementIds );
-
-        final Collection<DataElementOperand> allDataElementOperands = categoryService
-            .getOperandsByIds( allDataElementIds );
-        final Collection<DataElementOperand> dataElementInIndicatorOperands = categoryService
-            .getOperandsByIds( dataElementInIndicatorIds );
-        final Collection<DataElementOperand> dataElementInCalculatedDataElementOperands = categoryService
-            .getOperandsByIds( dataElementInCalculatedDataElementIds );
-        final Collection<DataElementOperand> nonCalculatedDataElementOperands = categoryService
-            .getOperandsByIds( nonCalculatedDataElementIds );
-            */
         
         Collection<DataElementOperand> nonCalculatedOperands = categoryService.getOperands( nonCalculatedDataElements );
         Collection<DataElementOperand> indicatorOperands = categoryService.populateOperands( getOperandsInIndicators( indicators ) );