diff --git a/activemq-core/src/main/java/org/apache/activemq/util/MarshallingSupport.java b/activemq-core/src/main/java/org/apache/activemq/util/MarshallingSupport.java
index 7cbe86f2a6..88fb5cfd07 100755
--- a/activemq-core/src/main/java/org/apache/activemq/util/MarshallingSupport.java
+++ b/activemq-core/src/main/java/org/apache/activemq/util/MarshallingSupport.java
@@ -175,12 +175,6 @@ public class MarshallingSupport {
         case BIG_STRING_TYPE:
             value = readUTF8(in);
             break;
-        case MAP_TYPE:
-            value = unmarshalPrimitiveMap(in);
-            break;
-        case LIST_TYPE:
-            value = unmarshalPrimitiveList(in);
-            break;
         }
         return value;
     }