diff --git a/plugins/GSdx/res/glsl/common_header.glsl b/plugins/GSdx/res/glsl/common_header.glsl
index 441a5f5f4d..9420c24727 100644
--- a/plugins/GSdx/res/glsl/common_header.glsl
+++ b/plugins/GSdx/res/glsl/common_header.glsl
@@ -80,8 +80,7 @@ layout(std140, binding = 21) uniform cb21
     vec4 WH;
 
     vec2 TA;
-    //float _pad0;
-    int   Uber_ATST;
+    float pad0_cb21;
     float Af;
 
     uvec4 MskFix;
@@ -95,7 +94,7 @@ layout(std140, binding = 21) uniform cb21
     vec2 TextureScale;
     vec2 TC_OffsetHack;
 
-    vec3 pad_cb21;
+    vec3 pad1_cb21;
     float MaxDepthPS;
 
     mat4 DitherMatrix;
diff --git a/plugins/GSdx/res/glsl/tfx_fs.glsl b/plugins/GSdx/res/glsl/tfx_fs.glsl
index 7cead42de9..57266774ff 100644
--- a/plugins/GSdx/res/glsl/tfx_fs.glsl
+++ b/plugins/GSdx/res/glsl/tfx_fs.glsl
@@ -530,29 +530,6 @@ void atst(vec4 C)
 {
     float a = C.a;
 
-#if 0
-    switch(Uber_ATST) {
-        case 0:
-            break;
-        case 1:
-            if (a > AREF) discard;
-            break;
-        case 2:
-            if (a < AREF) discard;
-            break;
-        case 3:
-            if (abs(a - AREF) > 0.5f) discard;
-            break;
-        case 4:
-            if (abs(a - AREF) < 0.5f) discard;
-            break;
-    }
-
-
-#endif
-
-#if 1
-
 #if (PS_ATST == 0)
     // nothing to do
 #elif (PS_ATST == 1)
@@ -564,9 +541,6 @@ void atst(vec4 C)
 #elif (PS_ATST == 4)
     if (abs(a - AREF) < 0.5f) discard;
 #endif
-
-#endif
-
 }
 
 void fog(inout vec4 C, float f)
diff --git a/plugins/GSdx/res/tfx.fx b/plugins/GSdx/res/tfx.fx
index 3c7e8466a5..a6303524ed 100644
--- a/plugins/GSdx/res/tfx.fx
+++ b/plugins/GSdx/res/tfx.fx
@@ -564,27 +564,6 @@ void atst(float4 C)
 {
 	float a = C.a;
 
-#if 0
-	switch(Uber_ATST) {
-		case 0:
-			break;
-		case 1:
-			if (a > AREF) discard;
-			break;
-		case 2:
-			if (a < AREF) discard;
-			break;
-		case 3:
-			if (abs(a - AREF) > 0.5f) discard;
-			break;
-		case 4:
-			if (abs(a - AREF) < 0.5f) discard;
-			break;
-	}
-
-#endif
-
-#if 1
 	if(PS_ATST == 0)
 	{
 		// nothing to do
@@ -605,7 +584,6 @@ void atst(float4 C)
 	{
 		if (abs(a - AREF) < 0.5f) discard;
 	}
-#endif
 }
 
 float4 fog(float4 c, float f)