diff --git a/cudablas/compute/cuda_zgemm.c b/cudablas/compute/cuda_zgemm.c
index 0c6a61b4f43a214eeaa83a3b2f4c356c22207adb..abc0a24f95a186cf080294ad61446e2ddd01f6f3 100644
--- a/cudablas/compute/cuda_zgemm.c
+++ b/cudablas/compute/cuda_zgemm.c
@@ -34,10 +34,6 @@ int CUDA_zgemm(MORSE_enum transa, MORSE_enum transb,
                cuDoubleComplex *C, int ldc,
                CUBLAS_STREAM_PARAM)
 {
-
-#if !defined(CHAMELEON_USE_CUBLAS_V2)
-    cublasSetKernelStream( stream );
-#endif
     cublasZgemm(CUBLAS_HANDLE
                 morse_lapack_const(transa), morse_lapack_const(transb),
                 m, n, k,
@@ -46,6 +42,5 @@ int CUDA_zgemm(MORSE_enum transa, MORSE_enum transb,
                 CUBLAS_VALUE(beta),  C, ldc);
 
     assert( CUBLAS_STATUS_SUCCESS == cublasGetError() );
-
     return MORSE_SUCCESS;
 }
diff --git a/cudablas/compute/cuda_zhemm.c b/cudablas/compute/cuda_zhemm.c
index 8ed742362c32c0c6d0e2891510c333efb7cf431d..2727223796d4791d27b25ca424678c4bcb5437c7 100644
--- a/cudablas/compute/cuda_zhemm.c
+++ b/cudablas/compute/cuda_zhemm.c
@@ -34,10 +34,6 @@ int CUDA_zhemm(MORSE_enum side, MORSE_enum uplo,
                cuDoubleComplex *C, int ldc,
                CUBLAS_STREAM_PARAM)
 {
-#if !defined(CHAMELEON_USE_CUBLAS_V2)
-    cublasSetKernelStream( stream );
-#endif
-
     cublasZhemm(CUBLAS_HANDLE
                 morse_lapack_const(side), morse_lapack_const(uplo),
                 m, n,
@@ -46,6 +42,5 @@ int CUDA_zhemm(MORSE_enum side, MORSE_enum uplo,
                 CUBLAS_VALUE(beta),  C, ldc);
 
     assert( CUBLAS_STATUS_SUCCESS == cublasGetError() );
-
     return MORSE_SUCCESS;
 }
diff --git a/cudablas/compute/cuda_zher2k.c b/cudablas/compute/cuda_zher2k.c
index 5b340abd58953d91f2d8a60965ab935173207972..204a41e64eb8c9d669a224bf7d8574229173ab0f 100644
--- a/cudablas/compute/cuda_zher2k.c
+++ b/cudablas/compute/cuda_zher2k.c
@@ -34,10 +34,6 @@ int CUDA_zher2k(MORSE_enum uplo, MORSE_enum trans,
                 cuDoubleComplex *C, int ldc,
                 CUBLAS_STREAM_PARAM)
 {
-#if !defined(CHAMELEON_USE_CUBLAS_V2)
-    cublasSetKernelStream( stream );
-#endif
-
     cublasZher2k(CUBLAS_HANDLE
                  morse_lapack_const(uplo), morse_lapack_const(trans),
                  n, k,
diff --git a/cudablas/compute/cuda_zherk.c b/cudablas/compute/cuda_zherk.c
index 39717408795f1dbd70076d4ccf81b7867888489f..1d36498a6e26447f03517321b393a13ebac5da97 100644
--- a/cudablas/compute/cuda_zherk.c
+++ b/cudablas/compute/cuda_zherk.c
@@ -33,10 +33,6 @@ int CUDA_zherk( MORSE_enum uplo, MORSE_enum trans,
                 cuDoubleComplex *B, int ldb,
                 CUBLAS_STREAM_PARAM)
 {
-#if !defined(CHAMELEON_USE_CUBLAS_V2)
-    cublasSetKernelStream( stream );
-#endif
-
     cublasZherk(
         morse_lapack_const(uplo), morse_lapack_const(trans),
         n, k,
diff --git a/cudablas/compute/cuda_zlarfb.c b/cudablas/compute/cuda_zlarfb.c
index c35b555861e140400f223dc7a5d460a75286def8..dac0174395c3fd5f5ebbb9e37afc43c809b2ee60 100644
--- a/cudablas/compute/cuda_zlarfb.c
+++ b/cudablas/compute/cuda_zlarfb.c
@@ -49,10 +49,6 @@ CUDA_zlarfb(MORSE_enum side, MORSE_enum trans,
 
     MORSE_enum transT, uplo, notransV, transV;
 
-#if !defined(CHAMELEON_USE_CUBLAS_V2)
-    cublasSetKernelStream( stream );
-#endif
-
     /* Check input arguments */
     if ((side != MorseLeft) && (side != MorseRight)) {
         return -1;
diff --git a/cudablas/compute/cuda_zsymm.c b/cudablas/compute/cuda_zsymm.c
index 93ec3f386942d33cee4250721be2a794679e581a..4b448dd0371f070123d7700f29c6c89efc9e5b0e 100644
--- a/cudablas/compute/cuda_zsymm.c
+++ b/cudablas/compute/cuda_zsymm.c
@@ -34,10 +34,6 @@ int CUDA_zsymm(MORSE_enum side, MORSE_enum uplo,
                cuDoubleComplex *C, int ldc,
                CUBLAS_STREAM_PARAM)
 {
-#if !defined(CHAMELEON_USE_CUBLAS_V2)
-    cublasSetKernelStream( stream );
-#endif
-
     cublasZsymm(CUBLAS_HANDLE
                 morse_lapack_const(side), morse_lapack_const(uplo),
                 m, n,
diff --git a/cudablas/compute/cuda_zsyr2k.c b/cudablas/compute/cuda_zsyr2k.c
index 839ea2d68774c3a24f746048f2d9737d53640b85..64e4f4be11b3f0da94b2e0700129aa5c16d77a6f 100644
--- a/cudablas/compute/cuda_zsyr2k.c
+++ b/cudablas/compute/cuda_zsyr2k.c
@@ -35,10 +35,6 @@ int CUDA_zsyr2k(
         cuDoubleComplex *C, int ldc,
         CUBLAS_STREAM_PARAM)
 {
-#if !defined(CHAMELEON_USE_CUBLAS_V2)
-    cublasSetKernelStream( stream );
-#endif
-
     cublasZsyr2k(CUBLAS_HANDLE
                  morse_lapack_const(uplo), morse_lapack_const(trans),
                  n, k,
diff --git a/cudablas/compute/cuda_zsyrk.c b/cudablas/compute/cuda_zsyrk.c
index e988fbc41d9f56abd0cc73f8d42190fdea81bef0..b7e10c547d766c61c1799952b7b473053e6db62e 100644
--- a/cudablas/compute/cuda_zsyrk.c
+++ b/cudablas/compute/cuda_zsyrk.c
@@ -33,10 +33,6 @@ int CUDA_zsyrk(MORSE_enum uplo, MORSE_enum trans,
                cuDoubleComplex *C, int ldc,
                CUBLAS_STREAM_PARAM)
 {
-#if !defined(CHAMELEON_USE_CUBLAS_V2)
-    cublasSetKernelStream( stream );
-#endif
-
     cublasZsyrk(CUBLAS_HANDLE
                 morse_lapack_const(uplo), morse_lapack_const(trans),
                 n, k,
diff --git a/cudablas/compute/cuda_ztrmm.c b/cudablas/compute/cuda_ztrmm.c
index d86fa5267fe483ab5517d393aa93913f1bf7d512..7d87dfb397aff7e6ccb657338b9c777fc62b2836 100644
--- a/cudablas/compute/cuda_ztrmm.c
+++ b/cudablas/compute/cuda_ztrmm.c
@@ -34,10 +34,6 @@ int CUDA_ztrmm(
         cuDoubleComplex *B, int ldb,
         CUBLAS_STREAM_PARAM)
 {
-#if !defined(CHAMELEON_USE_CUBLAS_V2)
-    cublasSetKernelStream( stream );
-#endif
-
     cublasZtrmm(CUBLAS_HANDLE
         morse_lapack_const(side), morse_lapack_const(uplo),
         morse_lapack_const(transa), morse_lapack_const(diag),
diff --git a/cudablas/compute/cuda_ztrsm.c b/cudablas/compute/cuda_ztrsm.c
index d82766bc8e7710a3eb65aac2e2ae57e3427bf9a6..6953ccc7080073de22bb3cb4ac8582eaa80f0120 100644
--- a/cudablas/compute/cuda_ztrsm.c
+++ b/cudablas/compute/cuda_ztrsm.c
@@ -33,10 +33,6 @@ int CUDA_ztrsm(MORSE_enum side, MORSE_enum uplo,
                cuDoubleComplex *B, int ldb,
                CUBLAS_STREAM_PARAM)
 {
-#if !defined(CHAMELEON_USE_CUBLAS_V2)
-    cublasSetKernelStream( stream );
-#endif
-
     cublasZtrsm(CUBLAS_HANDLE
         morse_lapack_const(side), morse_lapack_const(uplo),
         morse_lapack_const(transa), morse_lapack_const(diag),