diff --git a/oncrpc4j-core/src/main/java/org/dcache/oncrpc4j/rpc/RpcCall.java b/oncrpc4j-core/src/main/java/org/dcache/oncrpc4j/rpc/RpcCall.java
index 53fba20..71f899b 100644
--- a/oncrpc4j-core/src/main/java/org/dcache/oncrpc4j/rpc/RpcCall.java
+++ b/oncrpc4j-core/src/main/java/org/dcache/oncrpc4j/rpc/RpcCall.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 - 2021 Deutsches Elektronen-Synchroton,
+ * Copyright (c) 2009 - 2022 Deutsches Elektronen-Synchroton,
  * Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY
  *
  * This library is free software; you can redistribute it and/or modify
@@ -295,9 +295,9 @@ public void startTLS() throws IOException {
     public void reject(int status, XdrAble reason) {
         XdrEncodingStream xdr = _xdr;
         try {
-            RpcMessage replyMessage = new RpcMessage(_xid, RpcMessageType.REPLY);
             xdr.beginEncoding();
-            replyMessage.xdrEncode(_xdr);
+            xdr.xdrEncodeInt(_xid);
+            xdr.xdrEncodeInt(RpcMessageType.REPLY);
             xdr.xdrEncodeInt(RpcReplyStatus.MSG_DENIED);
             xdr.xdrEncodeInt(status);
             reason.xdrEncode(_xdr);
@@ -324,9 +324,9 @@ public void acceptedReply(int state, XdrAble reply) {
 
         XdrEncodingStream xdr = _xdr;
         try {
-            RpcMessage replyMessage = new RpcMessage(_xid, RpcMessageType.REPLY);
             xdr.beginEncoding();
-            replyMessage.xdrEncode(_xdr);
+            xdr.xdrEncodeInt(_xid);
+            xdr.xdrEncodeInt(RpcMessageType.REPLY);
             xdr.xdrEncodeInt(RpcReplyStatus.MSG_ACCEPTED);
             _cred.getVerifier().xdrEncode(xdr);
             xdr.xdrEncodeInt(state);
@@ -459,8 +459,8 @@ private int callInternal(int procedure, XdrAble args, CompletionHandler<RpcReply
 
         Xdr xdr = new Xdr(Xdr.INITIAL_XDR_SIZE);
         xdr.beginEncoding();
-        RpcMessage rpcMessage = new RpcMessage(xid, RpcMessageType.CALL);
-        rpcMessage.xdrEncode(xdr);
+        xdr.xdrEncodeInt(xid);
+        xdr.xdrEncodeInt(RpcMessageType.CALL);
         xdr.xdrEncodeInt(RPCVERS);
         xdr.xdrEncodeInt(_prog);
         xdr.xdrEncodeInt(_version);
diff --git a/oncrpc4j-core/src/main/java/org/dcache/oncrpc4j/rpc/RpcMessage.java b/oncrpc4j-core/src/main/java/org/dcache/oncrpc4j/rpc/RpcMessage.java
deleted file mode 100644
index 260954c..0000000
--- a/oncrpc4j-core/src/main/java/org/dcache/oncrpc4j/rpc/RpcMessage.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2009 - 2018 Deutsches Elektronen-Synchroton,
- * Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this program (see the file COPYING.LIB for more
- * details); if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.dcache.oncrpc4j.rpc;
-
-import org.dcache.oncrpc4j.xdr.BadXdrOncRpcException;
-import org.dcache.oncrpc4j.xdr.XdrDecodingStream;
-import org.dcache.oncrpc4j.xdr.XdrEncodingStream;
-import org.dcache.oncrpc4j.xdr.XdrAble;
-
-public class RpcMessage implements XdrAble {
-
-    private int _xid;
-    private int _type;
-
-    RpcMessage(XdrDecodingStream xdr) throws BadXdrOncRpcException {
-        this.xdrDecode(xdr);
-    }
-
-    RpcMessage(int xid, int type) {
-        _xid = xid;
-        _type = type;
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr) throws BadXdrOncRpcException {
-        _xid = xdr.xdrDecodeInt();
-        _type = xdr.xdrDecodeInt();
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr) {
-        xdr.xdrEncodeInt(_xid);
-        xdr.xdrEncodeInt(_type);
-    }
-
-    public int xid() {
-        return _xid;
-    }
-
-    public int type() {
-        return _type;
-    }
-}
diff --git a/oncrpc4j-core/src/main/java/org/dcache/oncrpc4j/rpc/RpcProtocolFilter.java b/oncrpc4j-core/src/main/java/org/dcache/oncrpc4j/rpc/RpcProtocolFilter.java
index acf6e90..44426ff 100644
--- a/oncrpc4j-core/src/main/java/org/dcache/oncrpc4j/rpc/RpcProtocolFilter.java
+++ b/oncrpc4j-core/src/main/java/org/dcache/oncrpc4j/rpc/RpcProtocolFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 - 2018 Deutsches Elektronen-Synchroton,
+ * Copyright (c) 2009 - 2022 Deutsches Elektronen-Synchroton,
  * Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY
  *
  * This library is free software; you can redistribute it and/or modify
@@ -50,7 +50,9 @@ public NextAction handleRead(FilterChainContext ctx) throws IOException {
 
         xdr.beginDecoding();
 
-        RpcMessage message = new RpcMessage(xdr);
+        final int xid = xdr.xdrDecodeInt();
+        final int type = xdr.xdrDecodeInt();
+
         /**
          * In case of UDP grizzly does not populates connection with correct destination address.
          * We have to get peer address from the request context, which will contain SocketAddress where from
@@ -58,9 +60,9 @@ public NextAction handleRead(FilterChainContext ctx) throws IOException {
          */
         RpcTransport transport = new GrizzlyRpcTransport(ctx.getConnection(), (InetSocketAddress)ctx.getAddress(), _replyQueue);
 
-        switch (message.type()) {
+        switch (type) {
             case RpcMessageType.CALL:
-                RpcCall call = new RpcCall(message.xid(), xdr, transport);
+                RpcCall call = new RpcCall(xid, xdr, transport);
                 try {
                     call.accept();
                     ctx.setMessage(call);
@@ -76,8 +78,8 @@ public NextAction handleRead(FilterChainContext ctx) throws IOException {
                 return ctx.getInvokeAction();
             case RpcMessageType.REPLY:
                 try {
-                    RpcReply reply = new RpcReply(message.xid(), xdr, transport);
-                    CompletionHandler<RpcReply, RpcTransport> callback = _replyQueue.get(message.xid());
+                    RpcReply reply = new RpcReply(xid, xdr, transport);
+                    CompletionHandler<RpcReply, RpcTransport> callback = _replyQueue.get(xid);
                     if (callback != null) {
                         if (!reply.isAccepted()) {
                             callback.failed(new OncRpcRejectedException(reply.getRejectStatus()), transport);
diff --git a/oncrpc4j-core/src/test/java/org/dcache/oncrpc4j/rpc/RpcMessageParserTCPTest.java b/oncrpc4j-core/src/test/java/org/dcache/oncrpc4j/rpc/RpcMessageParserTCPTest.java
index 0ac55a0..f270a37 100644
--- a/oncrpc4j-core/src/test/java/org/dcache/oncrpc4j/rpc/RpcMessageParserTCPTest.java
+++ b/oncrpc4j-core/src/test/java/org/dcache/oncrpc4j/rpc/RpcMessageParserTCPTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 - 2018 Deutsches Elektronen-Synchroton,
+ * Copyright (c) 2009 - 2022 Deutsches Elektronen-Synchroton,
  * Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY
  *
  * This library is free software; you can redistribute it and/or modify
@@ -19,13 +19,6 @@
  */
 package org.dcache.oncrpc4j.rpc;
 
-import org.dcache.oncrpc4j.rpc.RpcAuth;
-import org.dcache.oncrpc4j.rpc.RpcMessageParserTCP;
-import org.dcache.oncrpc4j.rpc.RpcMessage;
-import org.dcache.oncrpc4j.rpc.ReplyQueue;
-import org.dcache.oncrpc4j.rpc.RpcMessageType;
-import org.dcache.oncrpc4j.rpc.RpcAuthTypeNone;
-import org.dcache.oncrpc4j.rpc.RpcProtocolFilter;
 import org.dcache.oncrpc4j.xdr.XdrVoid;
 import org.dcache.oncrpc4j.xdr.XdrAble;
 import org.dcache.oncrpc4j.xdr.XdrString;
@@ -147,8 +140,8 @@ public Xdr build() throws OncRpcException, IOException {
             Xdr xdr = new Xdr(Xdr.MAX_XDR_SIZE);
             xdr.beginEncoding();
 
-            RpcMessage rpcMessage = new RpcMessage(xid, RpcMessageType.CALL);
-            rpcMessage.xdrEncode(xdr);
+            xdr.xdrEncodeInt(xid);
+            xdr.xdrEncodeInt(RpcMessageType.CALL);
             xdr.xdrEncodeInt(rpcvers);
             xdr.xdrEncodeInt(prog);
             xdr.xdrEncodeInt(vers);
diff --git a/oncrpc4j-core/src/test/java/org/dcache/oncrpc4j/rpc/RpcProtocolFilterTest.java b/oncrpc4j-core/src/test/java/org/dcache/oncrpc4j/rpc/RpcProtocolFilterTest.java
index 71fb005..0e44288 100644
--- a/oncrpc4j-core/src/test/java/org/dcache/oncrpc4j/rpc/RpcProtocolFilterTest.java
+++ b/oncrpc4j-core/src/test/java/org/dcache/oncrpc4j/rpc/RpcProtocolFilterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 - 2018 Deutsches Elektronen-Synchroton,
+ * Copyright (c) 2009 - 2022 Deutsches Elektronen-Synchroton,
  * Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY
  *
  * This library is free software; you can redistribute it and/or modify
@@ -19,9 +19,6 @@
  */
 package org.dcache.oncrpc4j.rpc;
 
-import org.dcache.oncrpc4j.rpc.RpcMessage;
-import org.dcache.oncrpc4j.rpc.ReplyQueue;
-import org.dcache.oncrpc4j.rpc.RpcProtocolFilter;
 import org.dcache.oncrpc4j.xdr.Xdr;
 import java.io.IOException;
 import org.glassfish.grizzly.Connection;
@@ -58,8 +55,8 @@ public void testSomeMethod() throws IOException {
     private Xdr createBadXdr() {
         Xdr xdr = new Xdr(32);
         xdr.beginEncoding();
-        RpcMessage rpcMessage = new RpcMessage(1, 2); // xdr, type 0 = call, 1 = reply, 2 = not allowed
-        rpcMessage.xdrEncode(xdr);
+        xdr.xdrEncodeInt(1); // xid
+        xdr.xdrEncodeInt(2); // type: 0 = call, 1 = reply, x = invalid
         return xdr;
     }
 }