=== modified file 'dhis-2/dhis-web/dhis-web-api/pom.xml'
--- dhis-2/dhis-web/dhis-web-api/pom.xml	2016-01-15 00:52:40 +0000
+++ dhis-2/dhis-web/dhis-web-api/pom.xml	2016-02-23 08:29:23 +0000
@@ -42,10 +42,6 @@
       <artifactId>dhis-service-analytics</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-eventreporting</artifactId>
-    </dependency>
-    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
     </dependency>

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AggregationQueryController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AggregationQueryController.java	2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AggregationQueryController.java	2016-02-23 08:29:23 +0000
@@ -59,7 +59,6 @@
 
     public static final String RESOURCE_PATH = "/aggregationQueries";
 
-    @Autowired
     private CaseAggregationConditionService aggregationConditionService;
 
     @Autowired

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/pom.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/pom.xml	2016-01-15 00:52:40 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/pom.xml	2016-02-23 08:29:23 +0000
@@ -2,30 +2,30 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  
+
   <parent>
     <artifactId>dhis-web-maintenance</artifactId>
     <groupId>org.hisp.dhis</groupId>
     <version>2.23-SNAPSHOT</version>
   </parent>
-  
+
   <artifactId>dhis-web-maintenance-program</artifactId>
   <packaging>war</packaging>
   <name>DHIS Program and Attribute Management</name>
-  
+
   <build>
     <finalName>dhis-web-maintenance-program</finalName>
   </build>
-  
+
   <dependencies>
-    
+
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
-	</dependency>
-	
+    </dependency>
+
     <!-- DHIS -->
-    
+
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-api</artifactId>
@@ -49,27 +49,22 @@
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-core</artifactId>
     </dependency>
-    
+
+    <!-- POI Library -->
+
     <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-eventreporting</artifactId>
+      <groupId>org.apache.poi</groupId>
+      <artifactId>poi</artifactId>
     </dependency>
-    
-	<!-- POI Library -->
-	
-	<dependency>
-		<groupId>org.apache.poi</groupId>
-		<artifactId>poi</artifactId>
-	</dependency>
-	
-     <!-- Other -->
-     
+
+    <!-- Other -->
+
     <dependency>
       <groupId>net.sf.json-lib</groupId>
       <artifactId>json-lib</artifactId>
       <classifier>jdk15</classifier>
     </dependency>
-    
+
   </dependencies>
   <properties>
     <rootDir>../../../</rootDir>

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2016-02-15 08:24:00 +0000
+++ dhis-2/pom.xml	2016-02-23 08:29:23 +0000
@@ -329,11 +329,6 @@
       </dependency>
       <dependency>
         <groupId>org.hisp.dhis</groupId>
-        <artifactId>dhis-service-eventreporting</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.hisp.dhis</groupId>
         <artifactId>dhis-service-mobile</artifactId>
         <version>${project.version}</version>
       </dependency>