diff --git a/data/shaders/shadowmapping/offscreen.frag b/data/shaders/shadowmapping/offscreen.frag
index 5673c538..38d211d7 100644
--- a/data/shaders/shadowmapping/offscreen.frag
+++ b/data/shaders/shadowmapping/offscreen.frag
@@ -1,10 +1,8 @@
 #version 450
 
 layout(location = 0) out vec4 color;
-//layout(location = 0) out float fragmentdepth;
 
 void main() 
 {	
-//	fragmentdepth = gl_FragCoord.z;
 	color = vec4(1.0, 0.0, 0.0, 1.0);
 }
\ No newline at end of file
diff --git a/data/shaders/shadowmapping/offscreen.frag.spv b/data/shaders/shadowmapping/offscreen.frag.spv
index 482931cf..4d3440f8 100644
Binary files a/data/shaders/shadowmapping/offscreen.frag.spv and b/data/shaders/shadowmapping/offscreen.frag.spv differ
diff --git a/data/shaders/shadowmapping/offscreen.vert.spv b/data/shaders/shadowmapping/offscreen.vert.spv
index 3002a9a1..e5c7931d 100644
Binary files a/data/shaders/shadowmapping/offscreen.vert.spv and b/data/shaders/shadowmapping/offscreen.vert.spv differ
diff --git a/data/shaders/shadowmapping/quad.frag.spv b/data/shaders/shadowmapping/quad.frag.spv
index bbf17a30..13c24dee 100644
Binary files a/data/shaders/shadowmapping/quad.frag.spv and b/data/shaders/shadowmapping/quad.frag.spv differ
diff --git a/data/shaders/shadowmapping/quad.vert.spv b/data/shaders/shadowmapping/quad.vert.spv
index 8a906316..ffb2cb36 100644
Binary files a/data/shaders/shadowmapping/quad.vert.spv and b/data/shaders/shadowmapping/quad.vert.spv differ
diff --git a/data/shaders/shadowmapping/scene.frag b/data/shaders/shadowmapping/scene.frag
index 476c53ed..a8e67f56 100644
--- a/data/shaders/shadowmapping/scene.frag
+++ b/data/shaders/shadowmapping/scene.frag
@@ -60,7 +60,6 @@ void main()
 	vec3 V = normalize(inViewVec);
 	vec3 R = normalize(-reflect(L, N));
 	vec3 diffuse = max(dot(N, L), ambient) * inColor;
-//	vec3 specular = pow(max(dot(R, V), 0.0), 50.0) * vec3(0.75);
 
 	outFragColor = vec4(diffuse * shadow, 1.0);
 
diff --git a/data/shaders/shadowmapping/scene.frag.spv b/data/shaders/shadowmapping/scene.frag.spv
index e6e047d3..3f308890 100644
Binary files a/data/shaders/shadowmapping/scene.frag.spv and b/data/shaders/shadowmapping/scene.frag.spv differ
diff --git a/data/shaders/shadowmapping/scene.vert.spv b/data/shaders/shadowmapping/scene.vert.spv
index 4d449cb0..b9b21407 100644
Binary files a/data/shaders/shadowmapping/scene.vert.spv and b/data/shaders/shadowmapping/scene.vert.spv differ
diff --git a/examples/shadowmapping/shadowmapping.cpp b/examples/shadowmapping/shadowmapping.cpp
index 3b8d46e1..c0566d31 100644
--- a/examples/shadowmapping/shadowmapping.cpp
+++ b/examples/shadowmapping/shadowmapping.cpp
@@ -35,9 +35,6 @@
 #endif
 #define SHADOWMAP_FILTER VK_FILTER_LINEAR
 
-// Offscreen frame buffer properties
-#define FB_COLOR_FORMAT VK_FORMAT_R8G8B8A8_UNORM
-
 class VulkanExample : public VulkanExampleBase
 {
 public:
@@ -240,8 +237,6 @@ public:
 		offscreenPass.width = SHADOWMAP_DIM;
 		offscreenPass.height = SHADOWMAP_DIM;
 
-		VkFormat fbColorFormat = FB_COLOR_FORMAT;
-
 		// For shadow mapping we only need a depth attachment
 		VkImageCreateInfo image = vks::initializers::imageCreateInfo();
 		image.imageType = VK_IMAGE_TYPE_2D;
@@ -656,7 +651,7 @@ public:
 			VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
 			VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
 			&uniformBuffers.debug,
-			sizeof(uboVSscene)));
+			sizeof(uboVSquad)));
 
 		// Offscreen vertex shader uniform buffer block
 		VK_CHECK_RESULT(vulkanDevice->createBuffer(