=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalLevel.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalLevel.java	2014-03-30 04:37:39 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalLevel.java	2014-03-30 22:00:52 +0000
@@ -32,7 +32,6 @@
 import java.util.Date;
 
 import org.hisp.dhis.dataelement.CategoryOptionGroupSet;
-import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
 
 /**
  * Records the approval of DataSet values for a given OrganisationUnit and

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleGroup.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleGroup.java	2014-03-28 01:51:34 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleGroup.java	2014-03-30 22:00:52 +0000
@@ -37,7 +37,7 @@
 import org.hisp.dhis.common.annotation.Scanned;
 import org.hisp.dhis.common.view.DetailedView;
 import org.hisp.dhis.common.view.ExportView;
-import org.hisp.dhis.user.UserAuthorityGroup;
+import org.hisp.dhis.user.UserGroup;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonView;
@@ -45,7 +45,6 @@
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import org.hisp.dhis.user.UserGroup;
 
 /**
  * @author Lars Helge Overland

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/AddApprovalLevelAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/AddApprovalLevelAction.java	2014-03-30 04:37:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/AddApprovalLevelAction.java	2014-03-30 22:00:52 +0000
@@ -33,8 +33,6 @@
 import org.hisp.dhis.dataelement.CategoryOptionGroupSet;
 import org.hisp.dhis.dataelement.DataElementCategoryService;
 import org.hisp.dhis.i18n.I18n;
-import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
-import org.hisp.dhis.organisationunit.OrganisationUnitService;
 
 import com.opensymphony.xwork2.Action;
 
@@ -55,18 +53,11 @@
         this.dataApprovalLevelService = dataApprovalLevelService;
     }
 
-    private OrganisationUnitService organisationUnitService;
-
-    public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
-    {
-        this.organisationUnitService = organisationUnitService;
-    }
-
-    private DataElementCategoryService dataElementCategoryService;
-
-    public void setDataElementCategoryService( DataElementCategoryService dataElementCategoryService )
-    {
-        this.dataElementCategoryService = dataElementCategoryService;
+    private DataElementCategoryService categoryService;
+
+    public void setCategoryService( DataElementCategoryService categoryService )
+    {
+        this.categoryService = categoryService;
     }
 
     private I18n i18n;
@@ -115,7 +106,7 @@
 
         if ( categoryOptionGroupSet != 0 )
         {
-            catOptGroupSet = dataElementCategoryService.getCategoryOptionGroupSet( categoryOptionGroupSet );
+            catOptGroupSet = categoryService.getCategoryOptionGroupSet( categoryOptionGroupSet );
         }
 
         DataApprovalLevel dataApprovalLevel = new DataApprovalLevel( organisationUnitLevel, catOptGroupSet );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetAddApprovalLevelFormParameters.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetAddApprovalLevelFormParameters.java	2014-03-28 10:13:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetAddApprovalLevelFormParameters.java	2014-03-30 22:00:52 +0000
@@ -54,11 +54,11 @@
         this.organisationUnitService = organisationUnitService;
     }
 
-    private DataElementCategoryService dataElementCategoryService;
+    private DataElementCategoryService categoryService;
 
-    public void setDataElementCategoryService( DataElementCategoryService dataElementCategoryService )
+    public void setCategoryService( DataElementCategoryService categoryService )
     {
-        this.dataElementCategoryService = dataElementCategoryService;
+        this.categoryService = categoryService;
     }
 
     // -------------------------------------------------------------------------
@@ -86,7 +86,7 @@
     public String execute()
     {
         organisationUnitLevels = organisationUnitService.getOrganisationUnitLevels();
-        categoryOptionGroupSets = dataElementCategoryService.getAllCategoryOptionGroupSets();
+        categoryOptionGroupSets = categoryService.getAllCategoryOptionGroupSets();
 
         return SUCCESS;
     }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/META-INF/dhis/beans.xml	2014-02-19 04:11:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/META-INF/dhis/beans.xml	2014-03-30 22:00:52 +0000
@@ -65,11 +65,18 @@
     <property name="dataApprovalLevelService" ref="org.hisp.dhis.dataapproval.DataApprovalLevelService" />
   </bean>
 
+  <bean id="org.hisp.dhis.settings.action.system.AddApprovalLevelAction"
+      class="org.hisp.dhis.settings.action.system.AddApprovalLevelAction"
+      scope="prototype">
+    <property name="dataApprovalLevelService" ref="org.hisp.dhis.dataapproval.DataApprovalLevelService" />
+    <property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
+  </bean>
+
   <bean id="org.hisp.dhis.settings.action.system.GetAddApprovalLevelFormParameters"
       class="org.hisp.dhis.settings.action.system.GetAddApprovalLevelFormParameters"
       scope="prototype">
     <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
-    <property name="dataElementCategoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
+    <property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
   </bean>
 
   <!--
@@ -82,23 +89,15 @@
   </bean>
   -->
 
-  <bean id="org.hisp.dhis.settings.action.system.AddApprovalLevelAction"
-        class="org.hisp.dhis.settings.action.system.AddApprovalLevelAction"
-        scope="prototype">
-    <property name="dataApprovalLevelService" ref="org.hisp.dhis.dataapproval.DataApprovalLevelService" />
-    <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
-    <property name="dataElementCategoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
-  </bean>
-
   <bean id="org.hisp.dhis.settings.action.system.MoveApprovalLevelDownAction"
-        class="org.hisp.dhis.settings.action.system.MoveApprovalLevelDownAction"
-        scope="prototype">
+      class="org.hisp.dhis.settings.action.system.MoveApprovalLevelDownAction"
+      scope="prototype">
     <property name="dataApprovalLevelService" ref="org.hisp.dhis.dataapproval.DataApprovalLevelService" />
   </bean>
 
   <bean id="org.hisp.dhis.settings.action.system.MoveApprovalLevelUpAction"
-        class="org.hisp.dhis.settings.action.system.MoveApprovalLevelUpAction"
-        scope="prototype">
+      class="org.hisp.dhis.settings.action.system.MoveApprovalLevelUpAction"
+      scope="prototype">
     <property name="dataApprovalLevelService" ref="org.hisp.dhis.dataapproval.DataApprovalLevelService" />
   </bean>