diff --git a/shaders/dimensions/composite1.fsh b/shaders/dimensions/composite1.fsh
index 46354a9..47a61b9 100644
--- a/shaders/dimensions/composite1.fsh
+++ b/shaders/dimensions/composite1.fsh
@@ -1268,8 +1268,8 @@ void main() {
 		#endif
 	
 		#ifdef IS_LPV_ENABLED
-			vec3 lpvPos = GetLpvPosition(feetPlayerPos) + 0.5*viewToWorld(FlatNormals);
-			// vec3 lpvPos = GetLpvPosition(feetPlayerPos) - 0.5*FlatNormals + slopednormal;
+			// vec3 lpvPos = GetLpvPosition(feetPlayerPos) + 0.5*viewToWorld(FlatNormals);
+			vec3 lpvPos = GetLpvPosition(feetPlayerPos) - 0.5*viewToWorld(FlatNormals) + slopednormal;
 		#else
 			const vec3 lpvPos = vec3(0.0);
 		#endif
diff --git a/shaders/lib/lpv_render.glsl b/shaders/lib/lpv_render.glsl
index 1a1b3a4..56e8815 100644
--- a/shaders/lib/lpv_render.glsl
+++ b/shaders/lib/lpv_render.glsl
@@ -1,12 +1,3 @@
-// float LpvVoxelTest(const in ivec3 voxelCoord) {
-//     ivec3 gridCell = ivec3(floor(voxelCoord / LIGHT_BIN_SIZE));
-//     uint gridIndex = GetVoxelGridCellIndex(gridCell);
-//     ivec3 blockCell = voxelCoord - gridCell * LIGHT_BIN_SIZE;
-
-//     uint blockId = GetVoxelBlockMask(blockCell, gridIndex);
-//     return IsTraceOpenBlock(blockId) ? 1.0 : 0.0;
-// }
-
 vec4 SampleLpvNearest(const in ivec3 lpvPos) {
     vec4 lpvSample = (frameCounter % 2) == 0
         ? imageLoad(imgLpv1, lpvPos)
@@ -34,56 +25,6 @@ vec4 SampleLpvLinear(const in vec3 lpvPos) {
     vec4 sample_x1y2z2 = SampleLpvNearest(lpvCoord + ivec3(0, 1, 1));
     vec4 sample_x2y2z2 = SampleLpvNearest(lpvCoord + ivec3(1, 1, 1));
 
-    // #ifdef LPV_VOXEL_TEST
-    //     vec3 lpvCameraOffset = fract(cameraPosition);
-    //     vec3 voxelCameraOffset = fract(cameraPosition / LIGHT_BIN_SIZE) * LIGHT_BIN_SIZE;
-    //     ivec3 voxelPos = ivec3(lpvPos - SceneLPVCenter + VoxelBlockCenter + voxelCameraOffset - lpvCameraOffset + 0.5);
-
-    //     float voxel_x1y1z1 = LpvVoxelTest(voxelPos + ivec3(0, 0, 0));
-    //     float voxel_x2y1z1 = LpvVoxelTest(voxelPos + ivec3(1, 0, 0));
-    //     float voxel_x1y2z1 = LpvVoxelTest(voxelPos + ivec3(0, 1, 0));
-    //     float voxel_x2y2z1 = LpvVoxelTest(voxelPos + ivec3(1, 1, 0));
-
-    //     float voxel_x1y1z2 = LpvVoxelTest(voxelPos + ivec3(0, 0, 1));
-    //     float voxel_x2y1z2 = LpvVoxelTest(voxelPos + ivec3(1, 0, 1));
-    //     float voxel_x1y2z2 = LpvVoxelTest(voxelPos + ivec3(0, 1, 1));
-    //     float voxel_x2y2z2 = LpvVoxelTest(voxelPos + ivec3(1, 1, 1));
-
-    //     sample_x1y1z1 *= voxel_x1y1z1;
-    //     sample_x2y1z1 *= voxel_x2y1z1;
-    //     sample_x1y2z1 *= voxel_x1y2z1;
-    //     sample_x2y2z1 *= voxel_x2y2z1;
-
-    //     sample_x1y1z2 *= voxel_x1y1z2;
-    //     sample_x2y1z2 *= voxel_x2y1z2;
-    //     sample_x1y2z2 *= voxel_x1y2z2;
-    //     sample_x2y2z2 *= voxel_x2y2z2;
-
-
-    //     // TODO: Add special checks for avoiding diagonal blending between occluded edges/corners
-
-    //     // TODO: preload voxel grid into array
-    //     // then prevent blending if all but current and opposing quadrants are empty
-
-    //     // ivec3 iq = 1 - ivec3(step(vec3(0.5), lpvF));
-    //     // float voxel_iqx = 1.0 - LpvVoxelTest(ivec3(voxelPos) + ivec3(iq.x, 0, 0));
-    //     // float voxel_iqy = 1.0 - LpvVoxelTest(ivec3(voxelPos) + ivec3(0, iq.y, 0));
-    //     // float voxel_iqz = 1.0 - LpvVoxelTest(ivec3(voxelPos) + ivec3(0, 0, iq.z));
-    //     // float voxel_corner = 1.0 - voxel_iqx * voxel_iqy * voxel_iqz;
-
-    //     // float voxel_y1 = LpvVoxelTest(ivec3(voxelPos + vec3(0, 0, 0)));
-    //     // sample_x1y1z1 *= voxel_y1;
-    //     // sample_x2y1z1 *= voxel_y1;
-    //     // sample_x1y1z2 *= voxel_y1;
-    //     // sample_x2y1z2 *= voxel_y1;
-
-    //     // float voxel_y2 = LpvVoxelTest(voxelPos + ivec3(0, 1, 0));
-    //     // sample_x1y2z1 *= voxel_y2;
-    //     // sample_x2y2z1 *= voxel_y2;
-    //     // sample_x1y2z2 *= voxel_y2;
-    //     // sample_x2y2z2 *= voxel_y2;
-    // #endif
-
     vec4 sample_y1z1 = mix(sample_x1y1z1, sample_x2y1z1, lpvF.x);
     vec4 sample_y2z1 = mix(sample_x1y2z1, sample_x2y2z1, lpvF.x);
 
@@ -93,16 +34,14 @@ vec4 SampleLpvLinear(const in vec3 lpvPos) {
     vec4 sample_z1 = mix(sample_y1z1, sample_y2z1, lpvF.y);
     vec4 sample_z2 = mix(sample_y1z2, sample_y2z2, lpvF.y);
 
-    return mix(sample_z1, sample_z2, lpvF.z);// * voxel_corner;
+    return mix(sample_z1, sample_z2, lpvF.z);
 }
 
 vec3 GetLpvBlockLight(const in vec4 lpvSample) {
-    // return GetLpvBlockLight(lpvSample, 1.0);
-    return 3.0 * lpvSample.rgb;// * LPV_BLOCKLIGHT_SCALE);// * DynamicLightBrightness;
+    return 3.0 * lpvSample.rgb;
 }
 
 float GetLpvSkyLight(const in vec4 lpvSample) {
     float skyLight = saturate(lpvSample.a);
-    // return _pow2(skyLight);
     return skyLight*skyLight;
 }
diff --git a/shaders/lib/voxel_read.glsl b/shaders/lib/voxel_read.glsl
index 118a3ce..a8a4e18 100644
--- a/shaders/lib/voxel_read.glsl
+++ b/shaders/lib/voxel_read.glsl
@@ -1,12 +1,6 @@
 uint GetVoxelBlock(const in ivec3 voxelPos) {
-	// TODO: exit early if outside bounds
+	if (clamp(voxelPos, ivec3(0), ivec3(VoxelSize3-1u)) != voxelPos)
+		return BLOCK_EMPTY;
 	
 	return imageLoad(imgVoxelMask, voxelPos).r;
 }
-
-// uint GetVoxelBlock(const in vec3 playerPos) {
-// 	ivec3 voxelPos = GetVoxelIndex(playerPos);
-
-// 	// TODO: exit early if outside bounds
-// 	return imageLoad(imgVoxelMask, voxelPos).r;
-// }