diff --git a/libxrdp/libxrdp.c b/libxrdp/libxrdp.c
index df755f2b..594fcc73 100644
--- a/libxrdp/libxrdp.c
+++ b/libxrdp/libxrdp.c
@@ -89,33 +89,6 @@ libxrdp_get_pdu_bytes(const char *aheader)
         /* TPKT */
         rv = (header[2] << 8) | header[3];
     }
-    else if (header[0] == 0x30)
-    {
-        /* TSRequest (NLA) */
-        if (header[1] & 0x80)
-        {
-            if ((header[1] & ~(0x80)) == 1)
-            {
-                rv = header[2];
-                rv += 3;
-            }
-            else if ((header[1] & ~(0x80)) == 2)
-            {
-                rv = (header[2] << 8) | header[3];
-                rv += 4;
-            }
-            else
-            {
-                g_writeln("libxrdp_get_pdu_bytes: error TSRequest!");
-                return -1;
-            }
-        }
-        else
-        {
-            rv = header[1];
-            rv += 2;
-        }
-    }
     else
     {
         /* Fast-Path */
diff --git a/libxrdp/xrdp_rdp.c b/libxrdp/xrdp_rdp.c
index 4fc83ae8..6523a5b0 100644
--- a/libxrdp/xrdp_rdp.c
+++ b/libxrdp/xrdp_rdp.c
@@ -155,7 +155,7 @@ xrdp_rdp_read_config(struct xrdp_client_info *client_info)
             }
             else
             {
-                log_message(LOG_LEVEL_ALWAYS,"Warning: Your configured fastpath level is"
+                log_message(LOG_LEVEL_ALWAYS,"Warning: Your configured fastpath level is "
                           "undefined, fastpath will not be used");
                 client_info->use_fast_path = 0;
             }
@@ -176,7 +176,7 @@ xrdp_rdp_read_config(struct xrdp_client_info *client_info)
             }
             else
             {
-                log_message(LOG_LEVEL_ALWAYS,"Warning: Your configured security layer is"
+                log_message(LOG_LEVEL_ALWAYS,"Warning: Your configured security layer is "
                           "undefined, xrdp will negotiate client compatible");
                 client_info->security_layer = PROTOCOL_SSL | PROTOCOL_HYBRID | PROTOCOL_HYBRID_EX;
             }
@@ -369,7 +369,7 @@ xrdp_rdp_recv(struct xrdp_rdp *self, struct stream *s, int *code)
     {
         /* check for fastpath first */
         header = (const tui8 *) (s->p);
-        if ((header[0] != 0x3) && (header[0] != 0x3c))
+        if (header[0] != 0x3)
         {
             if (xrdp_sec_recv_fastpath(self->sec_layer, s) != 0)
             {