diff --git a/dspace-api/src/main/java/org/dspace/content/DSpaceObjectServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/DSpaceObjectServiceImpl.java
index 1b87ca69f8..3cdd8c8e1a 100644
--- a/dspace-api/src/main/java/org/dspace/content/DSpaceObjectServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/DSpaceObjectServiceImpl.java
@@ -27,7 +27,6 @@ import org.dspace.content.authority.Choices;
 import org.dspace.content.authority.service.ChoiceAuthorityService;
 import org.dspace.content.authority.service.MetadataAuthorityService;
 import org.dspace.content.service.DSpaceObjectService;
-import org.dspace.content.service.ItemService;
 import org.dspace.content.service.MetadataFieldService;
 import org.dspace.content.service.MetadataValueService;
 import org.dspace.content.service.RelationshipService;
@@ -65,8 +64,6 @@ public abstract class DSpaceObjectServiceImpl<T extends DSpaceObject> implements
     @Autowired(required = true)
     protected MetadataAuthorityService metadataAuthorityService;
     @Autowired(required = true)
-    protected ItemService itemService;
-    @Autowired(required = true)
     protected RelationshipService relationshipService;
 
     public DSpaceObjectServiceImpl() {
@@ -559,7 +556,7 @@ public abstract class DSpaceObjectServiceImpl<T extends DSpaceObject> implements
             Map<MetadataField, Integer> fieldToLastPlace = new HashMap<>();
             List<MetadataValue> metadataValues = new LinkedList<>();
             if (dso.getType() == Constants.ITEM) {
-                metadataValues = itemService.getMetadata((Item) dso, Item.ANY, Item.ANY, Item.ANY, Item.ANY);
+                metadataValues = getMetadata(dso, Item.ANY, Item.ANY, Item.ANY, Item.ANY);
             } else {
                 metadataValues = dso.getMetadata();
             }
diff --git a/dspace-api/src/main/java/org/dspace/content/MetadataValueComparator.java b/dspace-api/src/main/java/org/dspace/content/MetadataValueComparator.java
index ed914ee7af..ea7abb9e42 100644
--- a/dspace-api/src/main/java/org/dspace/content/MetadataValueComparator.java
+++ b/dspace-api/src/main/java/org/dspace/content/MetadataValueComparator.java
@@ -18,9 +18,11 @@ public class MetadataValueComparator
     implements Comparator<MetadataValue>, Serializable {
     @Override
     public int compare(MetadataValue mv1, MetadataValue mv2) {
-        int compare = mv1.getMetadataField().getMetadataSchema().getID().compareTo(mv2.getMetadataField().getMetadataSchema().getID());
-        if (compare != 0)
+        int compare = mv1.getMetadataField().getMetadataSchema().getID()
+                         .compareTo(mv2.getMetadataField().getMetadataSchema().getID());
+        if (compare != 0) {
             return compare;
+        }
         compare = mv1.getMetadataField().getElement().compareTo(mv2.getMetadataField().getElement());
         //TODO: continue comparison
         return compare;