diff --git a/src/system/SystemConfig.h b/src/system/SystemConfig.h
index 49c0935312bc23..15e6abdb5d4e83 100644
--- a/src/system/SystemConfig.h
+++ b/src/system/SystemConfig.h
@@ -358,26 +358,6 @@
 #define CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE 15
 #endif /* CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE */
 
-/**
- *  @def CHIP_CONFIG_TCP_SUPPORT_CLIENT
- *
- *  @brief
- *      Indicates whether the current node supports TCP Client
- */
-#ifndef CHIP_CONFIG_TCP_SUPPORT_CLIENT
-#define CHIP_CONFIG_TCP_SUPPORT_CLIENT 0
-#endif /* CHIP_CONFIG_TCP_SUPPORT_CLIENT */
-
-/**
- *  @def CHIP_CONFIG_TCP_SUPPORT_SERVER
- *
- *  @brief
- *      Indicates whether the current node supports TCP Server
- */
-#ifndef CHIP_CONFIG_TCP_SUPPORT_SERVER
-#define CHIP_CONFIG_TCP_SUPPORT_SERVER 0
-#endif /* CHIP_CONFIG_TCP_SUPPORT_SERVER */
-
 /**
  *  @def CHIP_SYSTEM_CONFIG_PACKETBUFFER_LWIP_PBUF_RAM
  *
diff --git a/src/transport/SecureMessageCodec.h b/src/transport/SecureMessageCodec.h
index 6b82d52d0f3d5b..315a29d711c85d 100644
--- a/src/transport/SecureMessageCodec.h
+++ b/src/transport/SecureMessageCodec.h
@@ -51,7 +51,7 @@ namespace SecureMessageCodec {
  * @return A CHIP_ERROR value consistent with the result of the encryption operation
  */
 CHIP_ERROR Encrypt(const CryptoContext & context, CryptoContext::ConstNonceView nonce, PayloadHeader & payloadHeader,
-                   PacketHeader & packetHeader, System::PacketBufferHandle & msgBuf, size_t inputMaxLength);
+                   PacketHeader & packetHeader, System::PacketBufferHandle & msgBuf, size_t inputMaxLength = kMaxAppMessageLen);
 
 /**
  * @brief