diff --git a/flight/PiOS/STM32F10x/pios_usart.c b/flight/PiOS/STM32F10x/pios_usart.c
index 98ff0481b..833e32368 100644
--- a/flight/PiOS/STM32F10x/pios_usart.c
+++ b/flight/PiOS/STM32F10x/pios_usart.c
@@ -34,9 +34,6 @@
 
 
 /* Global Variables */
-xSemaphoreHandle PIOS_USART1_Buffer;
-xSemaphoreHandle PIOS_USART2_Buffer;
-xSemaphoreHandle PIOS_USART3_Buffer;
 static portBASE_TYPE xHigherPriorityTaskWoken;
 
 /* Local Variables */
@@ -181,9 +178,6 @@ void PIOS_USART_Init(void)
 	USART_Cmd(PIOS_USART3_USART, ENABLE);
 #endif
 
-	vSemaphoreCreateBinary(PIOS_USART1_Buffer);
-	vSemaphoreCreateBinary(PIOS_USART2_Buffer);
-	vSemaphoreCreateBinary(PIOS_USART3_Buffer);
 }
 
 /**
@@ -346,19 +340,6 @@ int32_t PIOS_USART_RxBufferPut(USARTNumTypeDef usart, uint8_t b)
 	++rx_buffer_size[usart];
 	PIOS_IRQ_Enable();
 
-
-	switch(usart) {
-		case USART_1:
-			xSemaphoreGiveFromISR(PIOS_USART1_Buffer, &xHigherPriorityTaskWoken);
-			break;
-		case USART_2:
-			xSemaphoreGiveFromISR(PIOS_USART2_Buffer, &xHigherPriorityTaskWoken);
-			break;
-		case USART_3:
-			xSemaphoreGiveFromISR(PIOS_USART3_Buffer, &xHigherPriorityTaskWoken);
-			break;
-	}
-
 	/* No error */
 	return 0;
 }
diff --git a/flight/PiOS/STM32F10x/pios_usb_hid.c b/flight/PiOS/STM32F10x/pios_usb_hid.c
index 9a0335abc..ae9f7a1ed 100644
--- a/flight/PiOS/STM32F10x/pios_usb_hid.c
+++ b/flight/PiOS/STM32F10x/pios_usb_hid.c
@@ -45,8 +45,6 @@ typedef enum _HID_REQUESTS {
 } HID_REQUESTS;
 
 /* Global Variables */
-xSemaphoreHandle PIOS_HID_Buffer;
-static portBASE_TYPE xHigherPriorityTaskWoken;
 
 /* Local Variables */
 static uint32_t ProtocolValue;
@@ -102,8 +100,6 @@ int32_t PIOS_USB_HID_Init(uint32_t mode)
 		return -1;
 	}
 
-	vSemaphoreCreateBinary(PIOS_HID_Buffer);
-
 	return 0; /* No error */
 }
 
@@ -317,7 +313,6 @@ void PIOS_USB_HID_EP1_OUT_Callback(void)
 
 	/* We now have data waiting */
 	rx_buffer_new_data_ctr = PIOS_USB_HID_DATA_LENGTH;
-	xSemaphoreGiveFromISR(PIOS_HID_Buffer, &xHigherPriorityTaskWoken);
 
 #else
 	// FOR DEBUGGING USE ONLY
diff --git a/flight/PiOS/inc/pios_usart.h b/flight/PiOS/inc/pios_usart.h
index 1c539f7f2..3b8c7babc 100644
--- a/flight/PiOS/inc/pios_usart.h
+++ b/flight/PiOS/inc/pios_usart.h
@@ -31,11 +31,6 @@
 /* Global Types */
 typedef enum {USART_1 = 0, USART_2 = 1, USART_3 = 2} USARTNumTypeDef;
 
-/* Global Variables */
-extern xSemaphoreHandle PIOS_USART1_Buffer;
-extern xSemaphoreHandle PIOS_USART2_Buffer;
-extern xSemaphoreHandle PIOS_USART3_Buffer;
-
 /* Public Functions */
 extern void PIOS_USART_Init(void);
 extern void PIOS_USART_ChangeBaud(USART_TypeDef* USARTx, uint32_t Baud);
diff --git a/flight/PiOS/inc/pios_usb_hid.h b/flight/PiOS/inc/pios_usb_hid.h
index 67fe30132..12bd0c1fe 100644
--- a/flight/PiOS/inc/pios_usb_hid.h
+++ b/flight/PiOS/inc/pios_usb_hid.h
@@ -36,9 +36,6 @@
 
 #define PIOS_USB_HID_DATA_LENGTH		63
 
-/* Global Variables */
-extern xSemaphoreHandle PIOS_HID_Buffer;
-
 /* Global functions */
 extern int32_t PIOS_USB_HID_Init(uint32_t mode);
 extern int32_t PIOS_USB_HID_ChangeConnectionState(uint32_t Connected);