diff --git a/scm-core/src/main/java/sonia/scm/repository/api/BrowseCommandBuilder.java b/scm-core/src/main/java/sonia/scm/repository/api/BrowseCommandBuilder.java
index 655b7d4816..f37677f37b 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/BrowseCommandBuilder.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/BrowseCommandBuilder.java
@@ -191,7 +191,7 @@ public final class BrowseCommandBuilder
 
       if (fileObjects != null)
       {
-        Collections.sort(fileObjects, FileObjectNameComparator.instance);
+        fileObjects.sort(FileObjectNameComparator.instance);
         result.setFiles(fileObjects);
       }
     }
diff --git a/scm-core/src/main/java/sonia/scm/util/Util.java b/scm-core/src/main/java/sonia/scm/util/Util.java
index e57d48f314..d17219bfa2 100644
--- a/scm-core/src/main/java/sonia/scm/util/Util.java
+++ b/scm-core/src/main/java/sonia/scm/util/Util.java
@@ -38,23 +38,12 @@ package sonia.scm.util;
 import com.google.common.base.Strings;
 import com.google.common.collect.Multimap;
 
-//~--- JDK imports ------------------------------------------------------------
-
 import java.math.BigInteger;
-
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.*;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.TimeZone;
+//~--- JDK imports ------------------------------------------------------------
 
 /**
  *
@@ -278,7 +267,7 @@ public final class Util
 
     if (comparator != null)
     {
-      Collections.sort(valueList, comparator);
+      valueList.sort(comparator);
     }
 
     int length = valueList.size();
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/PluginResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/PluginResource.java
index c605c7c29a..72577b0cc3 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/PluginResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/PluginResource.java
@@ -38,42 +38,27 @@ package sonia.scm.api.rest.resources;
 import com.google.common.collect.Lists;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import sonia.scm.api.rest.RestActionResult;
-import sonia.scm.api.rest.RestActionUploadResult;
-import sonia.scm.plugin.OverviewPluginPredicate;
-import sonia.scm.plugin.PluginConditionFailedException;
-import sonia.scm.plugin.PluginInformation;
-import sonia.scm.plugin.PluginInformationComparator;
-import sonia.scm.plugin.PluginManager;
-
-//~--- JDK imports ------------------------------------------------------------
-
 import com.sun.jersey.multipart.FormDataParam;
 import com.webcohesion.enunciate.metadata.rs.ResponseCode;
 import com.webcohesion.enunciate.metadata.rs.StatusCodes;
 import com.webcohesion.enunciate.metadata.rs.TypeHint;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import sonia.scm.api.rest.RestActionResult;
+import sonia.scm.api.rest.RestActionUploadResult;
+import sonia.scm.plugin.*;
 
-import java.io.IOException;
-import java.io.InputStream;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
+import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+//~--- JDK imports ------------------------------------------------------------
 
 /**
  * RESTful Web Service Endpoint to manage plugins.
@@ -334,7 +319,7 @@ public class PluginResource
     );
     //J+
 
-    Collections.sort(plugins, PluginInformationComparator.INSTANCE);
+    plugins.sort(PluginInformationComparator.INSTANCE);
 
     Iterator<PluginInformation> it = plugins.iterator();
     String last = null;
diff --git a/scm-webapp/src/main/java/sonia/scm/group/DefaultGroupManager.java b/scm-webapp/src/main/java/sonia/scm/group/DefaultGroupManager.java
index 67b2709f53..cd2f1525c3 100644
--- a/scm-webapp/src/main/java/sonia/scm/group/DefaultGroupManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/group/DefaultGroupManager.java
@@ -338,7 +338,7 @@ public class DefaultGroupManager extends AbstractGroupManager
 
     if (comparator != null)
     {
-      Collections.sort(groups, comparator);
+      groups.sort(comparator);
     }
 
     return groups;
diff --git a/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java b/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
index 77cbf0cb2c..948ca15932 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
@@ -403,7 +403,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
 
     if (comparator != null)
     {
-      Collections.sort(repositories, comparator);
+      repositories.sort(comparator);
     }
 
     return repositories;
diff --git a/scm-webapp/src/main/java/sonia/scm/resources/AbstractResource.java b/scm-webapp/src/main/java/sonia/scm/resources/AbstractResource.java
index d5b21befe6..5ea598d587 100644
--- a/scm-webapp/src/main/java/sonia/scm/resources/AbstractResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/resources/AbstractResource.java
@@ -36,23 +36,18 @@ package sonia.scm.resources;
 //~--- non-JDK imports --------------------------------------------------------
 
 import com.google.common.io.Resources;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import sonia.scm.plugin.PluginLoader;
 import sonia.scm.util.Util;
 
-//~--- JDK imports ------------------------------------------------------------
-
 import java.io.IOException;
 import java.io.OutputStream;
-
 import java.net.URL;
-
-import java.util.Collections;
 import java.util.List;
 
+//~--- JDK imports ------------------------------------------------------------
+
 /**
  *
  * @author Sebastian Sdorra
@@ -105,7 +100,7 @@ public abstract class AbstractResource implements Resource
 
     if (Util.isNotEmpty(resourceHandlers))
     {
-      Collections.sort(resourceHandlers, new ResourceHandlerComparator());
+      resourceHandlers.sort(new ResourceHandlerComparator());
 
       for (ResourceHandler resourceHandler : resourceHandlers)
       {
diff --git a/scm-webapp/src/main/java/sonia/scm/resources/AbstractResourceManager.java b/scm-webapp/src/main/java/sonia/scm/resources/AbstractResourceManager.java
index 95d7b39b69..d9738fcc3a 100644
--- a/scm-webapp/src/main/java/sonia/scm/resources/AbstractResourceManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/resources/AbstractResourceManager.java
@@ -38,20 +38,13 @@ package sonia.scm.resources;
 import sonia.scm.plugin.Plugin;
 import sonia.scm.plugin.PluginLoader;
 import sonia.scm.plugin.PluginResources;
-
-//~--- JDK imports ------------------------------------------------------------
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
+import sonia.scm.plugin.PluginWrapper;
 
 import javax.servlet.ServletContext;
-import sonia.scm.plugin.PluginWrapper;
+import java.util.*;
+import java.util.Map.Entry;
+
+//~--- JDK imports ------------------------------------------------------------
 
 /**
  *
@@ -123,7 +116,7 @@ public abstract class AbstractResourceManager implements ResourceManager
       }
     }
 
-    Collections.sort(resources, ResourceNameComparator.INSTANCE);
+    resources.sort(ResourceNameComparator.INSTANCE);
 
     return resources;
   }
diff --git a/scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java b/scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java
index 0cdf1fd147..2dc598cf2c 100644
--- a/scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java
@@ -359,7 +359,7 @@ public class DefaultUserManager extends AbstractUserManager
     }
 
     if (comparator != null) {
-      Collections.sort(users, comparator);
+      users.sort(comparator);
     }
 
     return users;