diff --git a/kernel/generic/trmm_ltcopy_2.c b/kernel/generic/trmm_ltcopy_2.c
index 13a3bc53c..60cdeed1c 100644
--- a/kernel/generic/trmm_ltcopy_2.c
+++ b/kernel/generic/trmm_ltcopy_2.c
@@ -120,30 +120,18 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	  ao2 += 1; */
 	  b += 2;
 	} else
-	  if (X < posY) {
-	    data01 = *(ao1 + 0);
-	    data02 = *(ao1 + 1);
-
-	    b[ 0] = data01;
-	    b[ 1] = data02;
-	    // ao1 += lda;
-	    b += 2;
-	  } else {
 #ifdef UNIT
-	    data02 = *(ao1 + 1);
+	  if (X < posY) {
+#endif 
+	     b[ 0] = *(ao1 + 0);
+#ifdef UNIT
+	  } else {
 
 	    b[ 0] = ONE;
-	    b[ 1] = data02;
-#else
-	    data01 = *(ao1 + 0);
-	    data02 = *(ao1 + 1);
-
-	    b[ 0] = data01;
-	    b[ 1] = data02;
-#endif
-	    // ao1 += 2;
-	    b += 2;
 	  }
+#endif 
+	  b[ 1] = *(ao1 + 1);
+	  b += 2;
       }
 
       posY += 2;
diff --git a/kernel/generic/trmm_ltcopy_4.c b/kernel/generic/trmm_ltcopy_4.c
index 128536aad..e90d89209 100644
--- a/kernel/generic/trmm_ltcopy_4.c
+++ b/kernel/generic/trmm_ltcopy_4.c
@@ -410,36 +410,17 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 
       i = (m & 1);
       if (i) {
-
-	if (X > posY) {
-	  /* ao1 += 1;
-	  ao2 += 1; */
-
-	  b += 2;
-	} else
-	  if (X < posY) {
-	    data01 = *(ao1 + 0);
-	    data02 = *(ao1 + 1);
-
-	    b[ 0] = data01;
-	    b[ 1] = data02;
-	    // ao1 += lda;
-	    b += 2;
-	  } else {
 #ifdef UNIT
-	    data02 = *(ao1 + 1);
-
-	    b[ 0] = ONE;
-	    b[ 1] = data02;
-#else
-	    data01 = *(ao1 + 0);
-	    data02 = *(ao1 + 1);
-
-	    b[ 0] = data01;
-	    b[ 1] = data02;
+	if (X < posY) {
 #endif
-	    b += 2;
-	  }
+	  b[ 0] = *(ao1 + 0);
+#ifdef UNIT
+	} else {
+	  b[ 0] = ONE;
+	}
+#endif
+	b[ 1] = *(ao1 + 1);
+	b += 2;
       }
       posY += 2;
   }
diff --git a/kernel/generic/trmm_utcopy_16.c b/kernel/generic/trmm_utcopy_16.c
index 5d0f7dd2e..12642e7db 100644
--- a/kernel/generic/trmm_utcopy_16.c
+++ b/kernel/generic/trmm_utcopy_16.c
@@ -1487,23 +1487,19 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
       if (X < posY) {
 	a01 ++;
 	a02 ++;
-	b += 2;
-      } else
-	if (X > posY) {
-	  b[  0] = *(a01 +  0);
-	  b[  1] = *(a01 +  1);
-	  // a01 += lda;
-	  b += 2;
-	} else {
+      } else {
 #ifdef UNIT
-	  b[  0] = ONE;
-	  b[  1] = *(a01 +  1);
-#else
-	  b[  0] = *(a01 +  0);
-	  b[  1] = *(a01 +  1);
+	if (X > posY) {
 #endif
-	  b += 2;
+	  b[  0] = *(a01 +  0);
+#ifdef UNIT
+	} else {
+	  b[  0] = ONE;
 	}
+#endif
+	b[  1] = *(a01 +  1);
+      }
+      b += 2;
     }
     posY += 2;
   }
@@ -1522,25 +1518,22 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
     if (i > 0) {
       do {
 	if (X < posY) {
-	  a01 += 1;
-	  b ++;
-	} else
-	  if (X > posY) {
-	    b[  0] = *(a01 +  0);
-	    a01 += lda;
-	    b ++;
-	  } else {
+	  a01 ++;
+	} else {
 #ifdef UNIT
-	    b[ 0] = ONE;
-#else
-	    b[ 0] = *(a01 +  0);
+	  if (X > posY) {
 #endif
-	    a01 += lda;
-	    b ++;
+	    b[  0] = *(a01 +  0);
+#ifdef UNIT
+	  } else {
+	    b[ 0] = ONE;
 	  }
-
-	  X += 1;
-	  i --;
+#endif
+	  a01 += lda;
+	}
+	b ++;
+	X ++;
+	i --;
       } while (i > 0);
     }
     // posY += 1;
diff --git a/kernel/generic/trmm_utcopy_2.c b/kernel/generic/trmm_utcopy_2.c
index efa68162c..75076c382 100644
--- a/kernel/generic/trmm_utcopy_2.c
+++ b/kernel/generic/trmm_utcopy_2.c
@@ -161,27 +161,18 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
     i = m;
     if (m > 0) {
       do {
-	if (X < posY) {
-	  b += 1;
-  	  ao1 += 1;
-	} else
-	  if (X > posY) {
-	    data01 = *(ao1 + 0);
-	    b[ 0] = data01;
-	    b += 1;
-	    ao1 += lda;
-	  } else {
 #ifdef UNIT
-	    b[ 0] = ONE;
-#else
-	    data01 = *(ao1 + 0);
-	    b[ 0] = data01;
+        if (X > posY) {
 #endif
-	    b += 1;
-	    ao1 += lda;
-	  }
-
-	X += 1;
+	  b[ 0] = *(ao1 + 0);
+#ifdef UNIT
+	} else {
+	  b[ 0] = ONE;
+	}
+#endif
+        b ++;
+        ao1 += lda;
+	X ++;
 	i --;
       } while (i > 0);
     }
diff --git a/kernel/generic/trmm_utcopy_4.c b/kernel/generic/trmm_utcopy_4.c
index 3e7726b61..e5844094e 100644
--- a/kernel/generic/trmm_utcopy_4.c
+++ b/kernel/generic/trmm_utcopy_4.c
@@ -443,26 +443,21 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	do {
 
 	  if (X < posY) {
-	    b += 1;
 	    ao1 += 1;
-	  } else
-	    if (X > posY) {
-	      data01 = *(ao1 + 0);
-	      b[ 0] = data01;
-	      ao1 += lda;
-	      b += 1;
-	    } else {
+	  } else {
 #ifdef UNIT
-	      b[ 0] = ONE;
-#else
-	      data01 = *(ao1 + 0);
-	      b[ 0] = data01;
+	    if (X > posY) {
 #endif
-	      ao1 += lda;
-	      b += 1;
+	      b[ 0] = *(ao1 + 0);
+#ifdef UNIT
+	    } else {
+	      b[ 0] = ONE;
 	    }
-
-	  X += 1;
+#endif
+	    ao1 += lda;
+	  }
+	  b ++;
+	  X ++;
 	  i --;
 	} while (i > 0);
       }
diff --git a/kernel/generic/ztrmm_ltcopy_2.c b/kernel/generic/ztrmm_ltcopy_2.c
index deb675f73..7969f4f3d 100644
--- a/kernel/generic/ztrmm_ltcopy_2.c
+++ b/kernel/generic/ztrmm_ltcopy_2.c
@@ -139,48 +139,18 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
       }
 
       if (m & 1) {
-
-	if (X > posY) {
-	  /* ao1 += 2;
-	  ao2 += 2; */
-	  b += 4;
-
-	} else
-	  if (X < posY) {
-	    data1 = *(ao1 + 0);
-	    data2 = *(ao1 + 1);
-	    data3 = *(ao1 + 2);
-	    data4 = *(ao1 + 3);
-
-	    b[ 0] = data1;
-	    b[ 1] = data2;
-	    b[ 2] = data3;
-	    b[ 3] = data4;
-
-	    // ao1 += lda;
-	    b += 4;
-	  } else {
 #ifdef UNIT
-	    data3 = *(ao1 + 2);
-	    data4 = *(ao1 + 3);
-
+	  if (X < posY) {
+#endif
+	    b[ 0] = *(ao1 + 0);
+	    b[ 1] = *(ao1 + 1);
+#ifdef UNIT
+	  } else {
 	    b[ 0] = ONE;
 	    b[ 1] = ZERO;
-	    b[ 2] = data3;
-	    b[ 3] = data4;
-#else
-	    data1 = *(ao1 + 0);
-	    data2 = *(ao1 + 1);
-	    data3 = *(ao1 + 2);
-	    data4 = *(ao1 + 3);
-
-	    b[ 0] = data1;
-	    b[ 1] = data2;
-	    b[ 2] = data3;
-	    b[ 3] = data4;
-#endif
-	    b += 4;
 	  }
+#endif
+	  b += 4;
       }
 
       posY += 2;
diff --git a/kernel/generic/ztrmm_utcopy_1.c b/kernel/generic/ztrmm_utcopy_1.c
index 2746c5f5c..94d23ef9b 100644
--- a/kernel/generic/ztrmm_utcopy_1.c
+++ b/kernel/generic/ztrmm_utcopy_1.c
@@ -44,7 +44,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
   BLASLONG i, js;
   BLASLONG X;
 
-  FLOAT data01, data02;
+//  FLOAT data01, data02;
   FLOAT *ao1;
 
   lda += lda;
@@ -65,30 +65,21 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	do {
 	  if (X < posY) {
 	    ao1 += 2;
-	    b   += 2;
-	  } else
-	    if (X > posY) {
-	      data01 = *(ao1 + 0);
-	      data02 = *(ao1 + 1);
-	      b[ 0] = data01;
-	      b[ 1] = data02;
-	      ao1 += lda;
-	      b += 2;
-
-	    } else {
+	  } else {
 #ifdef UNIT
+	    if (X > posY) {
+#endif
+	      b[ 0] = *(ao1 + 0);
+	      b[ 1] = *(ao1 + 1);
+#ifdef UNIT
+	    } else {
 	      b[ 0] = ONE;
 	      b[ 1] = ZERO;
-#else
-	      data01 = *(ao1 + 0);
-	      data02 = *(ao1 + 1);
-	      b[ 0] = data01;
-	      b[ 1] = data02;
-#endif
-	      ao1 += lda;
-	      b += 2;
 	    }
-
+#endif
+	    ao1 += lda;
+	  }
+	  b += 2;
 	  X ++;
 	  i --;
 	} while (i > 0);
diff --git a/kernel/generic/ztrmm_utcopy_2.c b/kernel/generic/ztrmm_utcopy_2.c
index 6c7288ae9..03ce93d99 100644
--- a/kernel/generic/ztrmm_utcopy_2.c
+++ b/kernel/generic/ztrmm_utcopy_2.c
@@ -203,33 +203,22 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	do {
 	  if (X < posY) {
 	    ao1 += 2;
-	    b += 2;
-	  } else
-	    if (X > posY) {
-	      data1 = *(ao1 + 0);
-	      data2 = *(ao1 + 1);
-
-	      b[ 0] = data1;
-	      b[ 1] = data2;
-
-	      ao1 += lda;
-	      b += 2;
-	    } else {
+	  } else {
 #ifdef UNIT
+	    if (X > posY) {
+#endif
+	      b[ 0] = *(ao1 + 0);
+	      b[ 1] = *(ao1 + 1);
+#ifdef UNIT
+	    } else {
 	      b[ 0] = ONE;
 	      b[ 1] = ZERO;
-#else
-	      data1 = *(ao1 + 0);
-	      data2 = *(ao1 + 1);
-
-	      b[ 0] = data1;
-	      b[ 1] = data2;
-#endif
-	      ao1 += lda;
-	      b += 2;
 	    }
-
-	  X += 1;
+#endif
+	    ao1 += lda;
+	  }
+	  b += 2;
+	  X ++;
 	  i --;
 	} while (i > 0);
       }
diff --git a/kernel/generic/ztrmm_utcopy_8.c b/kernel/generic/ztrmm_utcopy_8.c
index ed4578579..946c136e7 100644
--- a/kernel/generic/ztrmm_utcopy_8.c
+++ b/kernel/generic/ztrmm_utcopy_8.c
@@ -856,25 +856,22 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
       do {
 	if (X < posY) {
 	  a01 += 2;
-	  b += 2;
-	} else
+	} else {
+#ifdef UNIT
 	  if (X > posY) {
+#endif
 	    b[  0] = *(a01 +  0);
 	    b[  1] = *(a01 +  1);
-	    a01 += lda;
-	    b += 2;
-	  } else {
 #ifdef UNIT
+	  } else {
 	    b[  0] = ONE;
 	    b[  1] = ZERO;
-#else
-	    b[  0] = *(a01 +  0);
-	    b[  1] = *(a01 +  1);
-#endif
-	    a01 += lda;
-	    b += 2;
 	  }
-	X += 1;
+#endif
+	  a01 += lda;
+	}
+	b += 2;
+	X ++;
 	i --;
       } while (i > 0);
     }