=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java	2015-09-15 04:41:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java	2015-09-15 05:08:23 +0000
@@ -97,10 +97,6 @@
     public static final String AGGREGATION_OPERATOR_AVERAGE_SUM = "avg_sum_org_unit"; // Sum in organisation unit
     public static final String AGGREGATION_OPERATOR_AVERAGE = "avg";
     public static final String AGGREGATION_OPERATOR_COUNT = "count";
-    public static final String AGGREGATION_OPERATOR_STDDEV = "stddev";
-    public static final String AGGREGATION_OPERATOR_VARIANCE = "variance";
-    public static final String AGGREGATION_OPERATOR_MIN = "min";
-    public static final String AGGREGATION_OPERATOR_MAX = "max";
     public static final String AGGREGATION_OPERATOR_NONE = "none";
 
     /**

=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java	2015-09-13 17:49:03 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java	2015-09-15 05:08:23 +0000
@@ -94,9 +94,6 @@
     @Autowired
     private SystemSettingManager systemSettingManager;
 
-    @Autowired
-    private ProgramIndicatorService programIndicatorService;
-
     // -------------------------------------------------------------------------
     // DefaultQueryPlanner implementation
     // -------------------------------------------------------------------------