diff --git a/build.sh b/build.sh
index dde1684..65962a3 100755
--- a/build.sh
+++ b/build.sh
@@ -34,7 +34,7 @@ fi
 # Convert Shader
 shader="${script_dir}/convert.comp.glsl"
 shader_compiler="glslc"
-shader_flags="--target-spv=spv1.4 -std=460 -O --target-env=vulkan1.2"
+shader_flags="-std=460 -O --target-env=vulkan1.2"
 shader_out="-o${build}/"
 shader_stage="-fshader-stage=comp"
 
diff --git a/vulkan.d b/vulkan.d
index 330cd2e..af20304 100644
--- a/vulkan.d
+++ b/vulkan.d
@@ -8,7 +8,7 @@ import core.stdc.stdio : Printf = printf;
 import std.format : sformat;
 import std.math.rounding : Ceil = ceil;
 
-debug
+version(VULKAN_DEBUG)
 {
 	const BUILD_DEBUG = true;
 }
@@ -102,12 +102,9 @@ const char*[] VK_AMD_DEVICE_EXTENSIONS = [
 	cast(char*)VK_AMD_SHADER_INFO_EXTENSION_NAME,
 ];
 
-version(AMD_GPU)
+version(AMD_GPU) 
 {
-	debug
-	{
-		const char*[] VK_DEVICE_EXTENSIONS = VK_AMD_DEVICE_EXTENSIONS ~ VK_BASE_DEVICE_EXTENSIONS;
-	}
+	version(VULKAN_DEBUG) const char*[] VK_DEVICE_EXTENSIONS = VK_AMD_DEVICE_EXTENSIONS ~ VK_BASE_DEVICE_EXTENSIONS;
 }
 else
 {
@@ -3122,13 +3119,10 @@ Destroy(VkInstance instance)
 void 
 Destroy(VkDebugUtilsMessengerEXT dbg, VkInstance instance)
 {
-	debug
+	version(VULKAN_DEBUG) if(dbg)
 	{
-		if(dbg)
-		{
-			vkDestroyDebugUtilsMessengerEXT(instance, dbg, null);
-		}
-	}	
+		vkDestroyDebugUtilsMessengerEXT(instance, dbg, null);
+	}
 }
 
 void
@@ -3332,12 +3326,9 @@ InitInstance(Vulkan* vk)
 		pEnabledValidationFeatures: &validation_enable,
 	};
 
-	debug
+	version(VULKAN_DEBUG) if(g_VLAYER_SUPPORT && g_DEBUG_PRINTF)
 	{
-		if(g_VLAYER_SUPPORT && g_DEBUG_PRINTF)
-		{
-			instance_info.pNext = &validation_features;
-		}
+		instance_info.pNext = &validation_features;
 	}
 
 	VkResult result = vkCreateInstance(&instance_info, null, &vk.instance);
@@ -3381,7 +3372,7 @@ version(Windows)
 void 
 EnableVLayers(Vulkan* vk)
 {
-	debug
+	version (VULKAN_DEBUG)
 	{
 		Push(vk, SI.Debug);
 
@@ -3428,7 +3419,7 @@ PrintShaderDisassembly(Vulkan* vk, Pipeline pipeline_id, VkShaderStageFlagBits s
 	{
 		PipelineHandles* pipeline = vk.pipeline_handles.ptr + pipeline_id;
 
-		debug
+		version(VULKAN_DEBUG)
 		{
 			u64 size;
 			VkResult result = vkGetShaderInfoAMD(vk.device, pipeline.handle, stage, VK_SHADER_INFO_TYPE_DISASSEMBLY_AMD, &size, null);
diff --git a/vulkan_funcs.d b/vulkan_funcs.d
index dcb2757..7f0e952 100644
--- a/vulkan_funcs.d
+++ b/vulkan_funcs.d
@@ -25,7 +25,7 @@ PFN_vkGetDeviceProcAddr vkGetDeviceProcAddr = null;
 PFN_vkDestroyInstance vkDestroyInstance = null;
 PFN_vkDestroySurfaceKHR vkDestroySurfaceKHR = null;
 
-debug
+version(VULKAN_DEBUG)
 {
 	PFN_vkCreateDebugUtilsMessengerEXT vkCreateDebugUtilsMessengerEXT = null;
 	PFN_vkDestroyDebugUtilsMessengerEXT vkDestroyDebugUtilsMessengerEXT = null;
@@ -46,7 +46,7 @@ version(Windows)
 
 version(AMD_GPU)
 {
-	debug
+	version(VULKAN_DEBUG)
 	{
 		PFN_vkGetShaderInfoAMD vkGetShaderInfoAMD = null;
 	}
@@ -230,7 +230,7 @@ LoadDeviceFunctions(Vulkan* vk)
 
 	version(AMD_GPU)
 	{
-		debug
+		version(VULKAN_DEBUG)
 		{
 			vkGetShaderInfoAMD = cast(PFN_vkGetShaderInfoAMD)vkGetDeviceProcAddr(vk.device, "vkGetShaderInfoAMD");
 			assert(vkGetShaderInfoAMD != null, "vkGetShaderInfoAMD pointer is null");
@@ -268,7 +268,7 @@ version(Windows)
 	vkCreateWin32SurfaceKHR = cast(PFN_vkCreateWin32SurfaceKHR)vkGetInstanceProcAddr(vk.instance, "vkCreateWin32SurfaceKHR");
 }
 
-debug
+version(VULKAN_DEBUG)
 {
 	vkCreateDebugUtilsMessengerEXT = cast(PFN_vkCreateDebugUtilsMessengerEXT)vkGetInstanceProcAddr(vk.instance, "vkCreateDebugUtilsMessengerEXT");
 	vkDestroyDebugUtilsMessengerEXT = cast(PFN_vkDestroyDebugUtilsMessengerEXT)vkGetInstanceProcAddr(vk.instance, "vkDestroyDebugUtilsMessengerEXT");