diff --git a/src/utils/asm-x86.h b/src/utils/asm-x86.h
index a6433e460..75b7305f4 100644
--- a/src/utils/asm-x86.h
+++ b/src/utils/asm-x86.h
@@ -203,9 +203,7 @@ VMA_ATTRIBUTE_OPTIMIZE_NONE
 #define __vma_memory_copy64(_dst, _src) \
 { \
 	static int is_wc_simd = cpuid_flags() &                \
-			(CPU_FLAG_SSE3 | CPU_FLAG_SSSE3 |              \
-					CPU_FLAG_SSE41 | CPU_FLAG_SSE42 |      \
-					CPU_FLAG_AVX | CPU_FLAG_AVX2);         \
+			(CPU_FLAG_SSE41 | CPU_FLAG_SSE42);             \
                                                            \
 	if (is_wc_simd) {                                      \
 		__asm__ __volatile__ (                             \
diff --git a/src/vma/dev/qp_mgr_eth_mlx5.cpp b/src/vma/dev/qp_mgr_eth_mlx5.cpp
index 4bcb8f8bb..f0d3d774e 100644
--- a/src/vma/dev/qp_mgr_eth_mlx5.cpp
+++ b/src/vma/dev/qp_mgr_eth_mlx5.cpp
@@ -90,13 +90,6 @@ static bool is_bf(struct ibv_context *ib_ctx)
 	static off_t offset = VMA_MLX5_MMAP_GET_WC_PAGES_CMD << VMA_MLX5_IB_MMAP_CMD_SHIFT;
 	char *env;
 
-#if defined(DEFINED_VERBS_VERSION) && (DEFINED_VERBS_VERSION == 3)
-	/* This limitation is done for RM: 1557652 */
-	if (safe_mce_sys().hypervisor != mce_sys_var::HYPER_NONE) {
-		return false;
-	}
-#endif
-
 	env = getenv("MLX5_SHUT_UP_BF");
 	if (!env || !strcmp(env, "0")) {
 		/*