diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java
index 1de7d911..6094f0e7 100644
--- a/src/main/java/org/bukkit/Registry.java
+++ b/src/main/java/org/bukkit/Registry.java
@@ -255,23 +255,23 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
      *
      * @see MemoryKey
      */
-    Registry<MemoryKey<?>> MEMORY_MODULE_TYPE = new Registry<>() {
+    Registry<MemoryKey> MEMORY_MODULE_TYPE = new Registry<MemoryKey>() {
 
         @NotNull
         @Override
-        public Iterator<MemoryKey<?>> iterator() {
+        public Iterator iterator() {
             return MemoryKey.values().iterator();
         }
 
         @Nullable
         @Override
-        public MemoryKey<?> get(@NotNull NamespacedKey key) {
+        public MemoryKey get(@NotNull NamespacedKey key) {
             return MemoryKey.getByKey(key);
         }
 
         @NotNull
         @Override
-        public Stream<MemoryKey<?>> stream() {
+        public Stream<MemoryKey> stream() {
             return StreamSupport.stream(spliterator(), false);
         }
     };
diff --git a/src/main/java/org/bukkit/entity/memory/MemoryKey.java b/src/main/java/org/bukkit/entity/memory/MemoryKey.java
index 4fc0fca0..8f601e85 100644
--- a/src/main/java/org/bukkit/entity/memory/MemoryKey.java
+++ b/src/main/java/org/bukkit/entity/memory/MemoryKey.java
@@ -44,7 +44,7 @@ public final class MemoryKey<T> implements Keyed {
         return tClass;
     }
 
-    private static final Map<NamespacedKey, MemoryKey<?>> MEMORY_KEYS = new HashMap<>();
+    private static final Map<NamespacedKey, MemoryKey> MEMORY_KEYS = new HashMap<>();
     //
     public static final MemoryKey<Location> HOME = new MemoryKey<>(NamespacedKey.minecraft("home"), Location.class);
     public static final MemoryKey<Location> POTENTIAL_JOB_SITE = new MemoryKey<>(NamespacedKey.minecraft("potential_job_site"), Location.class);
@@ -80,7 +80,7 @@ public final class MemoryKey<T> implements Keyed {
      * available under that key
      */
     @Nullable
-    public static MemoryKey<?> getByKey(@NotNull NamespacedKey namespacedKey) {
+    public static MemoryKey getByKey(@NotNull NamespacedKey namespacedKey) {
         return MEMORY_KEYS.get(namespacedKey);
     }
 
@@ -90,7 +90,7 @@ public final class MemoryKey<T> implements Keyed {
      * @return the memoryKeys
      */
     @NotNull
-    public static Set<MemoryKey<?>> values() {
+    public static Set<MemoryKey> values() {
         return new HashSet<>(MEMORY_KEYS.values());
     }
 }