diff --git a/src/common/Defines.h b/src/common/Defines.h
index 0eb05db1..69fdf85d 100644
--- a/src/common/Defines.h
+++ b/src/common/Defines.h
@@ -208,6 +208,7 @@ const uint8_t   IP_COMPRESS_RFC1144_UNCOMPRESS = 0x02U;
 #define __PROTECTED_READONLY_PROPERTY(type, variableName, propName)                     \
         protected: type m_##variableName;                                               \
         public: __forceinline type get##propName(void) const { return m_##variableName; }
+
 /// <summary>Creates a read-only get property, does not use "get"/"set".</summary>
 #define __PROTECTED_READONLY_PROPERTY_PLAIN(type, variableName, propName)               \
         protected: type m_##variableName;                                               \
@@ -216,10 +217,6 @@ const uint8_t   IP_COMPRESS_RFC1144_UNCOMPRESS = 0x02U;
 #define __READONLY_PROPERTY_PLAIN(type, variableName, propName)                         \
         private: type m_##variableName;                                                 \
         public: __forceinline type propName(void) const { return m_##variableName; }
-/// <summary>Creates a read-only get property by reference.</summary>
-#define __READONLY_PROPERTY_BYREF(type, variableName, propName)                         \
-        private: type m_##variableName;                                                 \
-        public: __forceinline type& get##propName(void) const { return m_##variableName; }
 
 /// <summary>Creates a get and set private property.</summary>
 #define __PROPERTY(type, variableName, propName)                                        \
@@ -231,6 +228,7 @@ const uint8_t   IP_COMPRESS_RFC1144_UNCOMPRESS = 0x02U;
         protected: type m_##variableName;                                               \
         public: __forceinline type get##propName(void) const { return m_##variableName; } \
                 __forceinline void set##propName(type val) { m_##variableName = val; }
+
 /// <summary>Creates a get and set private property, does not use "get"/"set".</summary>
 #define __PROPERTY_PLAIN(type, variableName, propName)                                  \
         private: type m_##variableName;                                                 \
@@ -241,10 +239,5 @@ const uint8_t   IP_COMPRESS_RFC1144_UNCOMPRESS = 0x02U;
         protected: type m_##variableName;                                               \
         public: __forceinline type propName(void) const { return m_##variableName; }    \
                 __forceinline void propName(type val) { m_##variableName = val; }
-/// <summary>Creates a get and set property by reference.</summary>
-#define __PROPERTY_BYREF(type, variableName, propName)                                  \
-        private: type m_##variableName;                                                 \
-        public: __forceinline type& get##propName(void) const { return m_##variableName; } \
-                __forceinline void set##propName(type& val) { m_##variableName = val; }
 
 #endif // __COMMON_DEFINES_H__
diff --git a/src/common/network/BaseNetwork.cpp b/src/common/network/BaseNetwork.cpp
index d312f8ae..6ffc6533 100644
--- a/src/common/network/BaseNetwork.cpp
+++ b/src/common/network/BaseNetwork.cpp
@@ -716,8 +716,7 @@ void BaseNetwork::createP25_MessageHdr(uint8_t* buffer, uint8_t duid, const p25:
     __SET_UINT16(dstId, buffer, 8U);
 
     uint16_t sysId = control.getSiteData().sysId();                                 // System ID
-    buffer[11U] = (sysId >> 8) & 0xFFU;
-    buffer[12U] = (sysId >> 0) & 0xFFU;
+    __SET_UINT16B(sysId, buffer, 11U);
 
     buffer[14U] = 0U;                                                               // Control Bits
 
@@ -740,8 +739,7 @@ void BaseNetwork::createP25_MessageHdr(uint8_t* buffer, uint8_t duid, const p25:
         buffer[181U] = control.getAlgId();                                          // Algorithm ID
 
         uint32_t kid = control.getKId();
-        buffer[182U] = (kid >> 8) & 0xFFU;                                          // Key ID
-        buffer[183U] = (kid >> 0) & 0xFFU;
+        __SET_UINT16B(kid, buffer, 182U);                                           // Key ID
 
         // copy MI data
         uint8_t mi[p25::P25_MI_LENGTH_BYTES];