diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/util/UaaMapUtils.java b/server/src/main/java/org/cloudfoundry/identity/uaa/util/UaaMapUtils.java
index <HASH>..<HASH> 100644
--- a/server/src/main/java/org/cloudfoundry/identity/uaa/util/UaaMapUtils.java
+++ b/server/src/main/java/org/cloudfoundry/identity/uaa/util/UaaMapUtils.java
@@ -113,7 +113,7 @@ public class UaaMapUtils {
         return new AbstractMap.SimpleEntry<>(key, value);
     }
 
-    public static <K extends Comparable<? super K>, V extends Object> Map<K, V> sortByKeys(Map<K,V> map) {
+    public static <K extends Comparable<? super K>, V> Map<K, V> sortByKeys(Map<K,V> map) {
         List<Entry<K, V>> sortedEntries = map
             .entrySet()
             .stream()
@@ -130,7 +130,7 @@ public class UaaMapUtils {
         return result;
     }
 
-    public static <K extends Comparable<? super K>, V extends Object> String prettyPrintYaml(Map<K,V> map) {
+    public static <K extends Comparable<? super K>, V> String prettyPrintYaml(Map<K,V> map) {
         DumperOptions dump = new DumperOptions();
         dump.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
         dump.setPrettyFlow(true);
Type parameter doesn't need to explictly extend Object

[#<I>]