diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/generic/GlGenericObjectRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/generic/GlGenericObjectRenderer.java
index 1e7e21ff8..cef25bf2f 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/generic/GlGenericObjectRenderer.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/generic/GlGenericObjectRenderer.java
@@ -417,9 +417,6 @@ public class GlGenericObjectRenderer implements IDhGenericRenderer
 		
 		this.init();
 		
-		boolean useInstancedRendering = this.instancedRenderingAvailable
-				&& Config.Client.Advanced.Graphics.GenericRendering.enableInstancedRendering.get();
-		
 		ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeGenericRenderSetupEvent.class, renderEventParam);
 		
 		
@@ -439,7 +436,7 @@ public class GlGenericObjectRenderer implements IDhGenericRenderer
 		GL32.glBlendEquation(GL32.GL_FUNC_ADD);
 		GLMC.glBlendFuncSeparate(GL32.GL_SRC_ALPHA, GL32.GL_ONE_MINUS_SRC_ALPHA, GL32.GL_ONE, GL32.GL_ONE_MINUS_SRC_ALPHA);
 		
-		IDhApiGenericObjectShaderProgram shaderProgram = useInstancedRendering ? this.instancedShaderProgram : this.directShaderProgram;
+		IDhApiGenericObjectShaderProgram shaderProgram = this.instancedRenderingAvailable ? this.instancedShaderProgram : this.directShaderProgram;
 		IDhApiGenericObjectShaderProgram shaderProgramOverride = OverrideInjector.INSTANCE.get(IDhApiGenericObjectShaderProgram.class);
 		if (shaderProgramOverride != null && shaderProgram.overrideThisFrame())
 		{
@@ -491,7 +488,7 @@ public class GlGenericObjectRenderer implements IDhGenericRenderer
 			}
 			
 			// update instanced data if needed
-			if (useInstancedRendering)
+			if (this.instancedRenderingAvailable)
 			{
 				boxGroup.tryUpdateInstancedDataAsync();	
 				
@@ -509,7 +506,7 @@ public class GlGenericObjectRenderer implements IDhGenericRenderer
 			profiler.popPush("rendering");
 			profiler.push(boxGroup.getResourceLocationNamespace());
 			profiler.push(boxGroup.getResourceLocationPath());
-			if (useInstancedRendering)
+			if (this.instancedRenderingAvailable)
 			{
 				this.renderBoxGroupInstanced(shaderProgram, renderEventParam, boxGroup, camPos, profiler);
 			}
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/glObject/GLProxy.java b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/glObject/GLProxy.java
index 5a3b2af90..9cc5a1683 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/glObject/GLProxy.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/glObject/GLProxy.java
@@ -220,16 +220,7 @@ public class GLProxy
 		return instance;
 	}
 	
-	public EDhApiGpuUploadMethod getGpuUploadMethod() 
-	{
-		EDhApiGpuUploadMethod uploadOverride = Config.Client.Advanced.Debugging.OpenGl.glUploadMode.get();
-		if (uploadOverride == EDhApiGpuUploadMethod.AUTO)
-		{
-			return this.preferredUploadMethod;
-		}
-		
-		return uploadOverride;
-	}
+	public EDhApiGpuUploadMethod getGpuUploadMethod() { return this.preferredUploadMethod; }
 	
 	public static boolean runningOnRenderThread()
 	{
diff --git a/coreSubProjects b/coreSubProjects
index 6aad156a3..13895fec5 160000
--- a/coreSubProjects
+++ b/coreSubProjects
@@ -1 +1 @@
-Subproject commit 6aad156a32ab552bac8f3a24df0edf78bda98a8a
+Subproject commit 13895fec5138f4937709b4c4e9c565caac3f844a