diff --git a/bindings/transport-generic/src/main/java/esa/mo/mal/transport/gen/Endpoint.java b/bindings/transport-generic/src/main/java/esa/mo/mal/transport/gen/Endpoint.java
index 4e968b50b..5da0dd57f 100644
--- a/bindings/transport-generic/src/main/java/esa/mo/mal/transport/gen/Endpoint.java
+++ b/bindings/transport-generic/src/main/java/esa/mo/mal/transport/gen/Endpoint.java
@@ -131,7 +131,7 @@ public MALMessage createMessage(final Blob authenticationId,
                             isErrorMessage,
                             supplements,
                             qosProperties),
-                    qosProperties, null, transport.getStreamFactory(), body);
+                    qosProperties, transport.getStreamFactory(), body);
         } catch (MALInteractionException ex) {
             throw new MALException("Error creating message", ex);
         }
@@ -169,7 +169,7 @@ public MALMessage createMessage(final Blob authenticationId,
                             isErrorMessage,
                             supplements,
                             qosProperties),
-                    qosProperties, null, transport.getStreamFactory(), body);
+                    qosProperties, transport.getStreamFactory(), body);
         } catch (MALInteractionException ex) {
             throw new MALException("Error creating message", ex);
         }
diff --git a/bindings/transport-generic/src/main/java/esa/mo/mal/transport/gen/GENMessage.java b/bindings/transport-generic/src/main/java/esa/mo/mal/transport/gen/GENMessage.java
index 6dbebc26b..6b1e680dd 100644
--- a/bindings/transport-generic/src/main/java/esa/mo/mal/transport/gen/GENMessage.java
+++ b/bindings/transport-generic/src/main/java/esa/mo/mal/transport/gen/GENMessage.java
@@ -61,8 +61,6 @@ public class GENMessage implements MALMessage, java.io.Serializable {
      * BLOBs.
      * @param header The message header to use.
      * @param qosProperties The QoS properties for this message.
-     * @param operation The details of the operation being encoding, can be
-     * null.
      * @param encFactory The stream factory to use for decoding.
      * @param body the body of the message.
      * @throws org.ccsds.moims.mo.mal.MALInteractionException If the operation
@@ -71,7 +69,6 @@ public class GENMessage implements MALMessage, java.io.Serializable {
     public GENMessage(final boolean wrapBodyParts,
             final MALMessageHeader header,
             final Map qosProperties,
-            final MALOperation operation,
             final MALElementStreamFactory encFactory,
             final Object... body) throws MALInteractionException {
         this.header = header;
diff --git a/bindings/transport-spp/src/main/java/esa/mo/mal/transport/spp/SPPEndpoint.java b/bindings/transport-spp/src/main/java/esa/mo/mal/transport/spp/SPPEndpoint.java
index 12a1a5ca2..b1c64684e 100644
--- a/bindings/transport-spp/src/main/java/esa/mo/mal/transport/spp/SPPEndpoint.java
+++ b/bindings/transport-spp/src/main/java/esa/mo/mal/transport/spp/SPPEndpoint.java
@@ -127,7 +127,7 @@ public MALMessage createMessage(final Blob authenticationId,
                     hdr.getConfiguration(),
                     getMessageSegmentCounter(hdr),
                     false, hdr,
-                    qosProperties, null, transport.getStreamFactory(), body);
+                    qosProperties, transport.getStreamFactory(), body);
         } catch (MALInteractionException ex) {
             throw new MALException("Error creating message", ex);
         }
@@ -168,7 +168,7 @@ public MALMessage createMessage(final Blob authenticationId,
             return new SPPMessage(
                     ((SPPBaseTransport) transport).getHeaderStreamFactory(),
                     hdr.getConfiguration(), getMessageSegmentCounter(hdr),
-                    false, hdr, qosProperties, null,
+                    false, hdr, qosProperties,
                     transport.getStreamFactory(), body);
         } catch (MALInteractionException ex) {
             throw new MALException("Error creating message", ex);
diff --git a/bindings/transport-spp/src/main/java/esa/mo/mal/transport/spp/SPPMessage.java b/bindings/transport-spp/src/main/java/esa/mo/mal/transport/spp/SPPMessage.java
index f6a24493f..ba9623b21 100644
--- a/bindings/transport-spp/src/main/java/esa/mo/mal/transport/spp/SPPMessage.java
+++ b/bindings/transport-spp/src/main/java/esa/mo/mal/transport/spp/SPPMessage.java
@@ -58,8 +58,6 @@ public class SPPMessage extends GENMessage {
      * BLOBs.
      * @param header The message header to use.
      * @param qosProperties The QoS properties for this message.
-     * @param operation The details of the operation being encoding, can be
-     * null.
      * @param encFactory The encoding factory.
      * @param body the body of the message.
      * @throws org.ccsds.moims.mo.mal.MALInteractionException If the operation
@@ -68,9 +66,8 @@ public class SPPMessage extends GENMessage {
     public SPPMessage(final MALElementStreamFactory hdrStreamFactory,
             final SPPConfiguration configuration, final SPPSegmentCounter segmentCounter,
             boolean wrapBodyParts, MALMessageHeader header, Map qosProperties,
-            MALOperation operation, MALElementStreamFactory encFactory,
-            Object... body) throws MALInteractionException {
-        super(wrapBodyParts, header, qosProperties, operation, encFactory, body);
+            MALElementStreamFactory encFactory, Object... body) throws MALInteractionException {
+        super(wrapBodyParts, header, qosProperties, encFactory, body);
 
         this.hdrStreamFactory = hdrStreamFactory;
         this.configuration = configuration;
diff --git a/bindings/transport-tcpip/src/main/java/esa/mo/mal/transport/tcpip/TCPIPEndpoint.java b/bindings/transport-tcpip/src/main/java/esa/mo/mal/transport/tcpip/TCPIPEndpoint.java
index 787794aae..e85d34143 100644
--- a/bindings/transport-tcpip/src/main/java/esa/mo/mal/transport/tcpip/TCPIPEndpoint.java
+++ b/bindings/transport-tcpip/src/main/java/esa/mo/mal/transport/tcpip/TCPIPEndpoint.java
@@ -61,7 +61,7 @@ public MALMessage createMessage(final Blob authenticationId,
                 isErrorMessage, supplements, qosProperties);
         try {
             return new TCPIPMessage(false, (TCPIPMessageHeader) hdr, qosProperties,
-                    null, transport.getStreamFactory(), body);
+                    transport.getStreamFactory(), body);
         } catch (MALInteractionException e) {
             throw new MALException("Error creating message", e);
         }
diff --git a/bindings/transport-tcpip/src/main/java/esa/mo/mal/transport/tcpip/TCPIPMessage.java b/bindings/transport-tcpip/src/main/java/esa/mo/mal/transport/tcpip/TCPIPMessage.java
index 8edf82fe5..b44ca431f 100644
--- a/bindings/transport-tcpip/src/main/java/esa/mo/mal/transport/tcpip/TCPIPMessage.java
+++ b/bindings/transport-tcpip/src/main/java/esa/mo/mal/transport/tcpip/TCPIPMessage.java
@@ -32,7 +32,6 @@
 import java.util.Map;
 import org.ccsds.moims.mo.mal.MALException;
 import org.ccsds.moims.mo.mal.MALInteractionException;
-import org.ccsds.moims.mo.mal.MALOperation;
 import org.ccsds.moims.mo.mal.encoding.MALElementOutputStream;
 import org.ccsds.moims.mo.mal.encoding.MALElementStreamFactory;
 
@@ -52,9 +51,8 @@ public TCPIPMessage(boolean wrapBodyParts,
     }
 
     public TCPIPMessage(boolean wrapBodyParts, TCPIPMessageHeader header, Map qosProperties,
-            MALOperation operation, MALElementStreamFactory encFactory,
-            Object... body) throws MALInteractionException {
-        super(wrapBodyParts, header, qosProperties, operation, encFactory, body);
+            MALElementStreamFactory encFactory, Object... body) throws MALInteractionException {
+        super(wrapBodyParts, header, qosProperties, encFactory, body);
     }
 
     /**
diff --git a/bindings/transport-zmtp/src/main/java/esa/mo/mal/transport/zmtp/ZMTPEndpoint.java b/bindings/transport-zmtp/src/main/java/esa/mo/mal/transport/zmtp/ZMTPEndpoint.java
index 15bae6246..a19cee2e6 100644
--- a/bindings/transport-zmtp/src/main/java/esa/mo/mal/transport/zmtp/ZMTPEndpoint.java
+++ b/bindings/transport-zmtp/src/main/java/esa/mo/mal/transport/zmtp/ZMTPEndpoint.java
@@ -87,7 +87,7 @@ public MALMessage createMessage(final Blob authenticationId,
                     qosProperties);
             return new ZMTPMessage(
                     ((ZMTPTransport) transport).getHeaderStreamFactory(),
-                    wrapBodyParts, hdr, qosProperties, null,
+                    wrapBodyParts, hdr, qosProperties,
                     transport.getStreamFactory(), body);
         } catch (MALInteractionException ex) {
             throw new MALException("Error creating message", ex);
@@ -127,7 +127,7 @@ public MALMessage createMessage(final Blob authenticationId,
                     qosProperties);
             return new ZMTPMessage(
                     ((ZMTPTransport) transport).getHeaderStreamFactory(),
-                    wrapBodyParts, hdr, qosProperties, null,
+                    wrapBodyParts, hdr, qosProperties,
                     transport.getStreamFactory(), body);
         } catch (MALInteractionException ex) {
             throw new MALException("Error creating message", ex);
diff --git a/bindings/transport-zmtp/src/main/java/esa/mo/mal/transport/zmtp/ZMTPMessage.java b/bindings/transport-zmtp/src/main/java/esa/mo/mal/transport/zmtp/ZMTPMessage.java
index 44f60484b..b6adf64cc 100644
--- a/bindings/transport-zmtp/src/main/java/esa/mo/mal/transport/zmtp/ZMTPMessage.java
+++ b/bindings/transport-zmtp/src/main/java/esa/mo/mal/transport/zmtp/ZMTPMessage.java
@@ -49,17 +49,15 @@ public class ZMTPMessage extends GENMessage {
      * BLOBs.
      * @param header The message header to use.
      * @param qosProperties The QoS properties for this message.
-     * @param operation The details of the operation being encoding, can be
-     * null.
      * @param encFactory The stream factory to use for message body encoding.
      * @param body the body of the message.
      * @throws org.ccsds.moims.mo.mal.MALInteractionException If the operation
      * is unknown.
      */
     public ZMTPMessage(final MALElementStreamFactory hdrStreamFactory, boolean wrapBodyParts,
-            MALMessageHeader header, Map qosProperties, MALOperation operation,
-            MALElementStreamFactory encFactory, Object... body) throws MALInteractionException {
-        super(wrapBodyParts, header, qosProperties, operation, encFactory, body);
+            MALMessageHeader header, Map qosProperties, MALElementStreamFactory encFactory,
+            Object... body) throws MALInteractionException {
+        super(wrapBodyParts, header, qosProperties, encFactory, body);
 
         this.hdrStreamFactory = hdrStreamFactory;
     }