diff --git a/Inc/mmr_can.h b/Inc/mmr_can.h
index cd9cbec..540271a 100644
--- a/Inc/mmr_can.h
+++ b/Inc/mmr_can.h
@@ -91,15 +91,12 @@ typedef struct {
  * } Point;
  *
  * HalStatus send(Point point) {
- *   static CanMailbox mailbox = 0;
- *
  *   MmrCanPacket packet = {
  *     .header = {
  *       .priority = MMR_CAN_MESSAGE_PRIORITY_NORMAL,
  *       .messageId = MMR_CAN_EXAMPLES_POINT,
  *       .senderId = 0xXXX,
  *     },
- *     .mailbox = &mailbox,
  *     .data = (uint8_t*)&point,
  *     .length = sizeof(point),
  *   };
@@ -118,7 +115,6 @@ typedef struct {
  */
 typedef struct {
   MmrCanHeader header;
-  CanMailbox *mailbox;
   uint8_t *data;
   uint8_t length;
 } MmrCanPacket;
diff --git a/Src/mmr_can_scs_manager.c b/Src/mmr_can_scs_manager.c
index fd56bd5..f577643 100644
--- a/Src/mmr_can_scs_manager.c
+++ b/Src/mmr_can_scs_manager.c
@@ -62,8 +62,7 @@ HalStatus MMR_CAN_HandleNextScs(CanHandle *hcan) {
   static int counter = 0;
 
   MmrCanScsEntry *entry = &__scsEntries[counter];
-  counter++;
-  counter %= MMR_CAN_SCS_ENTRIES_COUNT;
+  ++counter %= MMR_CAN_SCS_ENTRIES_COUNT;
 
   if (MMR_CAN_HeaderToBits(entry->header) == 0) {
     return HAL_OK;
@@ -81,10 +80,8 @@ HalStatus MMR_CAN_HandleNextScs(CanHandle *hcan) {
 
 
 HalStatus sendScs(CanHandle *hcan, MmrCanHeader header) {
-  static CanMailbox scsMailbox = 0;
   MmrCanPacket packet = {
     .header = header,
-    .mailbox = &scsMailbox,
     .length = 0,
   };