diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseBodyDecoder.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseBodyDecoder.java
index 3672fad2d64c..9381bbfe38a9 100644
--- a/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseBodyDecoder.java
+++ b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseBodyDecoder.java
@@ -20,7 +20,6 @@
 import com.azure.core.util.FluxUtil;
 import com.azure.core.implementation.TypeUtil;
 import com.azure.core.util.logging.ClientLogger;
-import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.io.IOException;
@@ -375,38 +374,13 @@ private static Object convertToResultType(Object wireResponse, Type resultType,
      */
     private static Type extractEntityTypeFromReturnType(HttpResponseDecodeData decodeData) {
         Type token = decodeData.getReturnType();
-        final ClientLogger logger = new ClientLogger(HttpResponseBodyDecoder.class);
         if (token != null) {
             if (TypeUtil.isTypeOrSubTypeOf(token, Mono.class)) {
                 token = TypeUtil.getTypeArgument(token);
-            } else if (TypeUtil.isTypeOrSubTypeOf(token, Flux.class)) {
-                Type t = TypeUtil.getTypeArgument(token);
-                try {
-                    // TODO: anuchan - unwrap OperationStatus a different way
-                    // Check for OperationStatus<?>
-                    if (TypeUtil.isTypeOrSubTypeOf(t, Class.forName(
-                        "com.azure.core.management.implementation.OperationStatus"))) {
-                        token = t;
-                    }
-                } catch (ClassNotFoundException ignored) {
-                    logger.warning("Failed to find class 'com.azure.core.management.implementation.OperationStatus'.");
-                }
             }
-
             if (TypeUtil.isTypeOrSubTypeOf(token, Response.class)) {
                 token = TypeUtil.getRestResponseBodyType(token);
             }
-
-            try {
-                // TODO: anuchan - unwrap OperationStatus a different way
-                if (TypeUtil.isTypeOrSubTypeOf(token, Class.forName(
-                    "com.azure.core.management.implementation.OperationStatus"))) {
-                    // Get Type of 'T' from OperationStatus<T>
-                    token = TypeUtil.getTypeArgument(token);
-                }
-            } catch (ClassNotFoundException ignored) {
-                logger.warning("Failed to find class 'com.azure.core.management.implementation.OperationStatus'.");
-            }
         }
         return token;
     }