=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java	2013-10-15 07:40:07 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java	2013-10-15 07:47:05 +0000
@@ -68,9 +68,6 @@
     private PatientService patientService;
 
     @Autowired
-    private OrganisationUnitService organisationUnitService;
-
-    @Autowired
     private I18nManager i18nManager;
 
     private I18nFormat _format;

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/person/AbstractPersonService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/person/AbstractPersonService.java	2013-10-14 10:24:31 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/person/AbstractPersonService.java	2013-10-15 07:47:05 +0000
@@ -32,9 +32,6 @@
 import org.hisp.dhis.dxf2.importsummary.ImportConflict;
 import org.hisp.dhis.dxf2.importsummary.ImportStatus;
 import org.hisp.dhis.dxf2.importsummary.ImportSummary;
-import org.hisp.dhis.i18n.I18nFormat;
-import org.hisp.dhis.i18n.I18nManager;
-import org.hisp.dhis.i18n.I18nManagerException;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.patient.Patient;
 import org.hisp.dhis.patient.PatientAttribute;
@@ -69,7 +66,7 @@
 /**
  * @author Morten Olav Hansen <mortenoh@gmail.com>
  */
-public abstract class AbstractPersonService 
+public abstract class AbstractPersonService
     implements PersonService
 {
     // -------------------------------------------------------------------------
@@ -92,40 +89,8 @@
     private RelationshipService relationshipService;
 
     @Autowired
-    private RelationshipTypeService relationshipTypeService;
-
-    @Autowired
     private IdentifiableObjectManager manager;
 
-    @Autowired
-    private I18nManager i18nManager;
-
-    private I18nFormat _format;
-
-    @Override
-    public void setFormat( I18nFormat format )
-    {
-        this._format = format;
-    }
-
-    public I18nFormat getFormat()
-    {
-        if ( _format != null )
-        {
-            return _format;
-        }
-
-        try
-        {
-            _format = i18nManager.getI18nFormat();
-        }
-        catch ( I18nManagerException ignored )
-        {
-        }
-
-        return _format;
-    }
-
     // -------------------------------------------------------------------------
     // READ
     // -------------------------------------------------------------------------