diff --git a/Core/Src/BQ_Communication.c b/Core/Src/BQ_Communication.c
index 26b46a5..4528947 100644
--- a/Core/Src/BQ_Communication.c
+++ b/Core/Src/BQ_Communication.c
@@ -1,8 +1,6 @@
 #include "BQ_Communication.h"
 
-#include "String.h"
-
-#include <stdlib.h>
+#include <string.h>
 
 UART_HandleTypeDef* bq_uart;
 DMA_HandleTypeDef* bq_dma;
@@ -121,7 +119,7 @@ uint16_t Check_CRC(uint8_t* message_buffer, uint16_t bufferlength) {
 
 uint32_t BQ_Write_Register(uint8_t registeraddress, uint8_t registersize,
                            uint32_t data) {
-  uint8_t* message = (uint8_t*)calloc(registersize + 5, sizeof(uint8_t));
+  uint8_t message[registersize + 5];
 
   message[0] = FRM_WRT_NR | (registersize & 0x07);
   message[1] = 0x00;
@@ -135,7 +133,6 @@ uint32_t BQ_Write_Register(uint8_t registeraddress, uint8_t registersize,
 
   BQ_UART_Transmit(message, registersize + 5);
 
-  free(message);
   return 1;
 }
 
@@ -157,13 +154,12 @@ uint8_t BQ_Read_Register(uint8_t registeraddress, uint8_t registersize,
 
   BQ_UART_Transmit(message, 6);
 
-  uint8_t* recv_message = (uint8_t*)calloc(registersize + 3, sizeof(uint8_t));
+  uint8_t recv_message[registersize + 3];
 
   BQ_UART_Receive(recv_message, registersize + 3);
 
   uint16_t crccheck = Check_CRC(recv_message, registersize + 3);
   if (crccheck == 0) {
-    free(recv_message);
     return 0;
   }
 
@@ -176,7 +172,6 @@ uint8_t BQ_Read_Register(uint8_t registeraddress, uint8_t registersize,
     data[0] |= recv_message[1 + n] >> (8 * n);
   }
 
-  free(recv_message);
   return 1;
 }
 
@@ -197,11 +192,10 @@ uint32_t BQ_ReadMeasurements(uint8_t* buffer, uint8_t bufferlength) {
   BQ_UART_Transmit(message, 6);
 
   uint16_t recv_len = 2 * (numofcells + numofdietemps) + 3;
-  uint8_t* recv_buf = (uint8_t*)calloc(recv_len, sizeof(uint8_t));
+  uint8_t recv_buf[recv_len];
   uint8_t uartstat = BQ_UART_Receive(recv_buf, recv_len);
 
   if (Check_CRC(recv_buf, recv_len) == 0) {
-    free(recv_buf);
     return 0;
   }
 
@@ -209,8 +203,6 @@ uint32_t BQ_ReadMeasurements(uint8_t* buffer, uint8_t bufferlength) {
     memcpy(buffer, &recv_buf[1], bufferlength);
   }
 
-  free(recv_buf);
-
   return 1;
 }
 
diff --git a/Core/Src/TMP144.c b/Core/Src/TMP144.c
index c82c0bf..92635a5 100644
--- a/Core/Src/TMP144.c
+++ b/Core/Src/TMP144.c
@@ -7,7 +7,7 @@
 
 #include "TMP144.h"
 
-#include "string.h"
+#include <string.h>
 
 static const uint8_t TMP144_SEQ_RESET[] = {0x55, 0xB4};
 static const uint8_t TMP144_SEQ_ADDR[] = {0x55, 0x8C, 0x90};