diff --git a/examples/onoff_light/src/main.rs b/examples/onoff_light/src/main.rs
index 3b94305..9cae24b 100644
--- a/examples/onoff_light/src/main.rs
+++ b/examples/onoff_light/src/main.rs
@@ -58,7 +58,7 @@ fn main() -> Result<(), impl Error> {
     let mut mdns = matter::mdns::libmdns::LibMdns::new()?;
     //let mut mdns = matter::mdns::DummyMdns {};
 
-    let matter = Matter::new_default(&dev_info, &mut mdns, matter::transport::udp::MATTER_PORT);
+    let matter = Matter::new_default(&dev_info, &mut mdns, matter::MATTER_PORT);
 
     let dev_att = dev_att::HardCodedDevAtt::new();
 
diff --git a/matter/src/core.rs b/matter/src/core.rs
index bed0e9e..2fc1c3a 100644
--- a/matter/src/core.rs
+++ b/matter/src/core.rs
@@ -28,6 +28,9 @@ use crate::{
     utils::{epoch::Epoch, rand::Rand},
 };
 
+/* The Matter Port */
+pub const MATTER_PORT: u16 = 5540;
+
 /// Device Commissioning Data
 pub struct CommissioningData {
     /// The data like password or verifier that is required to authenticate
diff --git a/matter/src/transport/udp.rs b/matter/src/transport/udp.rs
index b29ca05..909ab1e 100644
--- a/matter/src/transport/udp.rs
+++ b/matter/src/transport/udp.rs
@@ -15,7 +15,7 @@
  *    limitations under the License.
  */
 
-use crate::error::*;
+use crate::{error::*, MATTER_PORT};
 use log::{info, warn};
 use smol::net::{Ipv6Addr, UdpSocket};
 
@@ -27,12 +27,6 @@ pub struct UdpListener {
     socket: UdpSocket,
 }
 
-// Currently matches with the one in connectedhomeip repo
-pub const MAX_RX_BUF_SIZE: usize = 1583;
-
-/* The Matter Port */
-pub const MATTER_PORT: u16 = 5540;
-
 impl UdpListener {
     pub async fn new() -> Result<UdpListener, Error> {
         let listener = UdpListener {