diff --git a/src/main/java/com/simibubi/create/content/logistics/RedstoneLinkNetworkHandler.java b/src/main/java/com/simibubi/create/content/logistics/RedstoneLinkNetworkHandler.java
index 969ea7984..910ef68d1 100644
--- a/src/main/java/com/simibubi/create/content/logistics/RedstoneLinkNetworkHandler.java
+++ b/src/main/java/com/simibubi/create/content/logistics/RedstoneLinkNetworkHandler.java
@@ -52,7 +52,7 @@ public class RedstoneLinkNetworkHandler {
 
 		@Override
 		public int hashCode() {
-			return item.hashCode() ^ color;
+			return (item.hashCode() * 31) ^ color;
 		}
 
 		@Override
diff --git a/src/main/java/com/simibubi/create/foundation/OptionalUtil.java b/src/main/java/com/simibubi/create/foundation/OptionalUtil.java
deleted file mode 100644
index f15ec5969..000000000
--- a/src/main/java/com/simibubi/create/foundation/OptionalUtil.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.simibubi.create.foundation;
-
-import java.util.Optional;
-import java.util.function.Supplier;
-
-public class OptionalUtil {
-
-	public static <T> Optional<T> thenTry(Optional<T> first, Optional<T> thenTry) {
-		if (first.isPresent()) {
-			return first;
-		} else {
-			return thenTry;
-		}
-	}
-
-	public static <T> Optional<T> thenTryLazy(Supplier<Optional<T>> first, Supplier<Optional<T>> thenTry) {
-		Optional<T> one = first.get();
-		if (one.isPresent()) {
-			return one;
-		} else {
-			return thenTry.get();
-		}
-	}
-}
diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/ShaderLoadingException.java b/src/main/java/com/simibubi/create/foundation/render/backend/ShaderLoadingException.java
deleted file mode 100644
index 50b1c916a..000000000
--- a/src/main/java/com/simibubi/create/foundation/render/backend/ShaderLoadingException.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.simibubi.create.foundation.render.backend;
-
-public class ShaderLoadingException extends RuntimeException {
-
-    public ShaderLoadingException() {
-    }
-
-    public ShaderLoadingException(String message) {
-        super(message);
-    }
-
-    public ShaderLoadingException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public ShaderLoadingException(Throwable cause) {
-        super(cause);
-    }
-
-    public ShaderLoadingException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-        super(message, cause, enableSuppression, writableStackTrace);
-    }
-}
diff --git a/src/main/java/com/simibubi/create/foundation/utility/Pair.java b/src/main/java/com/simibubi/create/foundation/utility/Pair.java
index 7941c090d..908e7047c 100644
--- a/src/main/java/com/simibubi/create/foundation/utility/Pair.java
+++ b/src/main/java/com/simibubi/create/foundation/utility/Pair.java
@@ -49,7 +49,11 @@ public class Pair<F, S> {
 
 	@Override
 	public int hashCode() {
-		return (first == null ? 0 : first.hashCode()) ^ (second == null ? 0 : second.hashCode());
+		return (nullHash(first) * 31) ^ nullHash(second);
+	}
+
+	int nullHash(Object o) {
+		return o == null ? 0 : o.hashCode();
 	}
 
 	@Override