diff --git a/wolfcrypt/src/sha256.c b/wolfcrypt/src/sha256.c
index 9e73381b2..117c834d0 100644
--- a/wolfcrypt/src/sha256.c
+++ b/wolfcrypt/src/sha256.c
@@ -320,22 +320,14 @@ static int InitSha256(wc_Sha256* sha256)
 
     static WC_INLINE int inline_XTRANSFORM(wc_Sha256* S, const byte* D) {
         int ret;
-        if (Transform_Sha256_is_vectorized)
-            SAVE_VECTOR_REGISTERS(return _svr_ret;);
         ret = (*Transform_Sha256_p)(S, D);
-        if (Transform_Sha256_is_vectorized)
-            RESTORE_VECTOR_REGISTERS();
         return ret;
     }
 #define XTRANSFORM(...) inline_XTRANSFORM(__VA_ARGS__)
 
     static WC_INLINE int inline_XTRANSFORM_LEN(wc_Sha256* S, const byte* D, word32 L) {
         int ret;
-        if (Transform_Sha256_is_vectorized)
-            SAVE_VECTOR_REGISTERS(return _svr_ret;);
         ret = (*Transform_Sha256_Len_p)(S, D, L);
-        if (Transform_Sha256_is_vectorized)
-            RESTORE_VECTOR_REGISTERS();
         return ret;
     }
 #define XTRANSFORM_LEN(...) inline_XTRANSFORM_LEN(__VA_ARGS__)
diff --git a/wolfcrypt/src/sha512.c b/wolfcrypt/src/sha512.c
index b6ffb9dee..6d59192a7 100644
--- a/wolfcrypt/src/sha512.c
+++ b/wolfcrypt/src/sha512.c
@@ -509,20 +509,12 @@ static int InitSha512_256(wc_Sha512* sha512)
 
     static WC_INLINE int Transform_Sha512(wc_Sha512 *sha512) {
         int ret;
-        if (Transform_Sha512_is_vectorized)
-            SAVE_VECTOR_REGISTERS(return _svr_ret;);
         ret = (*Transform_Sha512_p)(sha512);
-        if (Transform_Sha512_is_vectorized)
-            RESTORE_VECTOR_REGISTERS();
         return ret;
     }
     static WC_INLINE int Transform_Sha512_Len(wc_Sha512 *sha512, word32 len) {
         int ret;
-        if (Transform_Sha512_is_vectorized)
-            SAVE_VECTOR_REGISTERS(return _svr_ret;);
         ret = (*Transform_Sha512_Len_p)(sha512, len);
-        if (Transform_Sha512_is_vectorized)
-            RESTORE_VECTOR_REGISTERS();
         return ret;
     }