diff --git a/OpenCL/m01750_a0.cl b/OpenCL/m01750_a0.cl
index 509538520..0ad47907f 100644
--- a/OpenCL/m01750_a0.cl
+++ b/OpenCL/m01750_a0.cl
@@ -116,12 +116,7 @@ void sha512_transform (const u64x w0[4], const u64x w1[4], const u64x w2[4], con
 
   ROUND_STEP (0);
 
-  #ifdef IS_AMD
-  // #pragma unroll
-  // breaks compiler
-  #else
-  #pragma unroll
-  #endif
+  //#pragma unroll
   for (int i = 16; i < 80; i += 16)
   {
     ROUND_EXPAND (); ROUND_STEP (i);
diff --git a/OpenCL/m01750_a1.cl b/OpenCL/m01750_a1.cl
index d920d1470..f2697fc38 100644
--- a/OpenCL/m01750_a1.cl
+++ b/OpenCL/m01750_a1.cl
@@ -114,12 +114,7 @@ void sha512_transform (const u64x w0[4], const u64x w1[4], const u64x w2[4], con
 
   ROUND_STEP (0);
 
-  #ifdef IS_AMD
-  // #pragma unroll
-  // breaks compiler
-  #else
-  #pragma unroll
-  #endif
+  //#pragma unroll
   for (int i = 16; i < 80; i += 16)
   {
     ROUND_EXPAND (); ROUND_STEP (i);
diff --git a/OpenCL/m01750_a3.cl b/OpenCL/m01750_a3.cl
index 2f08963c3..e2138504d 100644
--- a/OpenCL/m01750_a3.cl
+++ b/OpenCL/m01750_a3.cl
@@ -114,12 +114,7 @@ void sha512_transform (const u64x w0[4], const u64x w1[4], const u64x w2[4], con
 
   ROUND_STEP (0);
 
-  #ifdef IS_AMD
-  // #pragma unroll
-  // breaks compiler
-  #else
-  #pragma unroll
-  #endif
+  //#pragma unroll
   for (int i = 16; i < 80; i += 16)
   {
     ROUND_EXPAND (); ROUND_STEP (i);
diff --git a/OpenCL/m01760_a0.cl b/OpenCL/m01760_a0.cl
index 8e2338fc0..f48718041 100644
--- a/OpenCL/m01760_a0.cl
+++ b/OpenCL/m01760_a0.cl
@@ -116,12 +116,7 @@ void sha512_transform (const u64x w0[4], const u64x w1[4], const u64x w2[4], con
 
   ROUND_STEP (0);
 
-  #ifdef IS_AMD
-  // #pragma unroll
-  // breaks compiler
-  #else
-  #pragma unroll
-  #endif
+  //#pragma unroll
   for (int i = 16; i < 80; i += 16)
   {
     ROUND_EXPAND (); ROUND_STEP (i);
diff --git a/OpenCL/m01760_a1.cl b/OpenCL/m01760_a1.cl
index a0ba4be32..d32944697 100644
--- a/OpenCL/m01760_a1.cl
+++ b/OpenCL/m01760_a1.cl
@@ -114,12 +114,7 @@ void sha512_transform (const u64x w0[4], const u64x w1[4], const u64x w2[4], con
 
   ROUND_STEP (0);
 
-  #ifdef IS_AMD
-  // #pragma unroll
-  // breaks compiler
-  #else
-  #pragma unroll
-  #endif
+  //#pragma unroll
   for (int i = 16; i < 80; i += 16)
   {
     ROUND_EXPAND (); ROUND_STEP (i);
diff --git a/OpenCL/m01760_a3.cl b/OpenCL/m01760_a3.cl
index cb8ff6b1c..b45cfab0d 100644
--- a/OpenCL/m01760_a3.cl
+++ b/OpenCL/m01760_a3.cl
@@ -114,12 +114,7 @@ void sha512_transform (const u64x w0[4], const u64x w1[4], const u64x w2[4], con
 
   ROUND_STEP (0);
 
-  #ifdef IS_AMD
-  // #pragma unroll
-  // breaks compiler
-  #else
-  #pragma unroll
-  #endif
+  //#pragma unroll
   for (int i = 16; i < 80; i += 16)
   {
     ROUND_EXPAND (); ROUND_STEP (i);
diff --git a/OpenCL/m01800.cl b/OpenCL/m01800.cl
index e0c91f82b..d3a821c67 100644
--- a/OpenCL/m01800.cl
+++ b/OpenCL/m01800.cl
@@ -23,7 +23,8 @@
 // Buggy drivers...
 
 #ifdef IS_AMD
-#define STATE_DECL volatile
+//#define STATE_DECL volatile
+#define STATE_DECL
 #else
 #define STATE_DECL
 #endif
@@ -133,7 +134,7 @@ void sha512_transform (const u64 w[16], u64 digest[8])
 
   ROUND_STEP (0);
 
-  #pragma unroll
+  //#pragma unroll
   for (int i = 16; i < 80; i += 16)
   {
     ROUND_EXPAND (); ROUND_STEP (i);
diff --git a/OpenCL/m06221.cl b/OpenCL/m06221.cl
index 60bdf5409..294908034 100644
--- a/OpenCL/m06221.cl
+++ b/OpenCL/m06221.cl
@@ -115,12 +115,7 @@ void sha512_transform (const u64 w[16], u64 dgst[8])
 
   ROUND_STEP (0);
 
-  #ifdef IS_AMD
-  // #pragma unroll
-  // breaks compiler
-  #else
-  #pragma unroll
-  #endif
+  //#pragma unroll
   for (int i = 16; i < 80; i += 16)
   {
     ROUND_EXPAND (); ROUND_STEP (i);
diff --git a/OpenCL/m06222.cl b/OpenCL/m06222.cl
index 102a890e3..2620c7201 100644
--- a/OpenCL/m06222.cl
+++ b/OpenCL/m06222.cl
@@ -115,12 +115,7 @@ void sha512_transform (const u64 w[16], u64 dgst[8])
 
   ROUND_STEP (0);
 
-  #ifdef IS_AMD
-  // #pragma unroll
-  // breaks compiler
-  #else
-  #pragma unroll
-  #endif
+  //#pragma unroll
   for (int i = 16; i < 80; i += 16)
   {
     ROUND_EXPAND (); ROUND_STEP (i);
diff --git a/OpenCL/m06223.cl b/OpenCL/m06223.cl
index 86afa82c6..a0eb7c229 100644
--- a/OpenCL/m06223.cl
+++ b/OpenCL/m06223.cl
@@ -115,12 +115,7 @@ void sha512_transform (const u64 w[16], u64 dgst[8])
 
   ROUND_STEP (0);
 
-  #ifdef IS_AMD
-  // #pragma unroll
-  // breaks compiler
-  #else
-  #pragma unroll
-  #endif
+  //#pragma unroll
   for (int i = 16; i < 80; i += 16)
   {
     ROUND_EXPAND (); ROUND_STEP (i);
diff --git a/OpenCL/m06500.cl b/OpenCL/m06500.cl
index 5fa3977cd..44e4d7fc5 100644
--- a/OpenCL/m06500.cl
+++ b/OpenCL/m06500.cl
@@ -114,12 +114,7 @@ void sha512_transform (const u64 w0[4], const u64 w1[4], const u64 w2[4], const
 
   ROUND_STEP (0);
 
-  #ifdef IS_AMD
-  // #pragma unroll
-  // breaks compiler
-  #else
-  #pragma unroll
-  #endif
+  //#pragma unroll
   for (int i = 16; i < 80; i += 16)
   {
     ROUND_EXPAND (); ROUND_STEP (i);
diff --git a/OpenCL/m07100.cl b/OpenCL/m07100.cl
index 15252e71b..a9f09000e 100644
--- a/OpenCL/m07100.cl
+++ b/OpenCL/m07100.cl
@@ -114,12 +114,7 @@ void sha512_transform (const u64 w[16], u64 dgst[8])
 
   ROUND_STEP (0);
 
-  #ifdef IS_AMD
-  // #pragma unroll
-  // breaks compiler
-  #else
-  #pragma unroll
-  #endif
+  //#pragma unroll
   for (int i = 16; i < 80; i += 16)
   {
     ROUND_EXPAND (); ROUND_STEP (i);
diff --git a/OpenCL/m08200.cl b/OpenCL/m08200.cl
index da4405ee2..73e076d07 100644
--- a/OpenCL/m08200.cl
+++ b/OpenCL/m08200.cl
@@ -321,12 +321,7 @@ void sha512_transform (const u64 w[16], u64 dgst[8])
 
   ROUND512_STEP (0);
 
-  #ifdef IS_AMD
-  // #pragma unroll
-  // breaks compiler
-  #else
-  #pragma unroll
-  #endif
+  //#pragma unroll
   for (int i = 16; i < 80; i += 16)
   {
     ROUND512_EXPAND (); ROUND512_STEP (i);
diff --git a/OpenCL/m10700.cl b/OpenCL/m10700.cl
index 32ae0e3fd..c5ec11d83 100644
--- a/OpenCL/m10700.cl
+++ b/OpenCL/m10700.cl
@@ -242,7 +242,7 @@ void sha384_transform (const u64 w0[4], const u64 w1[4], const u64 w2[4], const
 
   ROUND384_STEP (0);
 
-  #pragma unroll
+  //#pragma unroll
   for (int i = 16; i < 80; i += 16)
   {
     ROUND384_EXPAND (); ROUND384_STEP (i);
@@ -352,7 +352,7 @@ void sha512_transform (const u64 w0[4], const u64 w1[4], const u64 w2[4], const
 
   ROUND512_STEP (0);
 
-  #pragma unroll
+  //#pragma unroll
   for (int i = 16; i < 80; i += 16)
   {
     ROUND512_EXPAND (); ROUND512_STEP (i);
diff --git a/OpenCL/m12300.cl b/OpenCL/m12300.cl
index 33b410a4d..5ab6a05a1 100644
--- a/OpenCL/m12300.cl
+++ b/OpenCL/m12300.cl
@@ -114,12 +114,7 @@ void sha512_transform (const u64 w[16], u64 dgst[8])
 
   ROUND_STEP (0);
 
-  #ifdef IS_AMD
-  // #pragma unroll
-  // breaks compiler
-  #else
-  #pragma unroll
-  #endif
+  //#pragma unroll
   for (int i = 16; i < 80; i += 16)
   {
     ROUND_EXPAND (); ROUND_STEP (i);