diff --git a/hepa-uv/firmware/CMakeLists.txt b/hepa-uv/firmware/CMakeLists.txt
index 7d4ac898b..d2056eb75 100644
--- a/hepa-uv/firmware/CMakeLists.txt
+++ b/hepa-uv/firmware/CMakeLists.txt
@@ -24,7 +24,6 @@ set(HEPAUV_FW_NON_LINTABLE_SRCS
         ${CMAKE_CURRENT_SOURCE_DIR}/clocking.c
         ${CMAKE_CURRENT_SOURCE_DIR}/utility_gpio.c
         ${CMAKE_CURRENT_SOURCE_DIR}/can.c
-        ${CMAKE_CURRENT_SOURCE_DIR}/led_hardware.c
         ${CMAKE_CURRENT_SOURCE_DIR}/i2c_setup.c
         ${COMMON_EXECUTABLE_DIR}/errors/errors.c
         ${COMMON_EXECUTABLE_DIR}/system/app_update.c
diff --git a/hepa-uv/firmware/stm32g4xx_it.c b/hepa-uv/firmware/stm32g4xx_it.c
index c644040fd..ee1a3295b 100644
--- a/hepa-uv/firmware/stm32g4xx_it.c
+++ b/hepa-uv/firmware/stm32g4xx_it.c
@@ -25,6 +25,7 @@
 #include "FreeRTOSConfig.h"
 #include "can/firmware/hal_can.h"
 #include "stm32g4xx_hal.h"
+
 /** @addtogroup STM32G4xx_HAL_Examples
  * @{
  */
@@ -36,22 +37,14 @@
 /* Private typedef -----------------------------------------------------------*/
 /* Private define ------------------------------------------------------------*/
 /* Private macro -------------------------------------------------------------*/
-/* Private variables
-   ---------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
 
-/* Private function prototypes
-   -----------------------------------------------*/
-/* Private functions
-   ---------------------------------------------------------*/
+/* Private function prototypes -----------------------------------------------*/
+/* Private functions ---------------------------------------------------------*/
 
-/* External variables
-   --------------------------------------------------------*/
+/* External variables --------------------------------------------------------*/
 DMA_HandleTypeDef hdma_spi1_tx;
 DMA_HandleTypeDef hdma_spi1_rx;
-extern TIM_HandleTypeDef htim1;
-extern TIM_HandleTypeDef htim2;
-extern TIM_HandleTypeDef htim3;
-extern TIM_HandleTypeDef htim15;
 
 /******************************************************************************/
 /*            Cortex-M4 Processor Exceptions Handlers                         */
@@ -122,6 +115,14 @@ void DebugMon_Handler(void) {}
 /*  file (startup_stm32g4xxxx.s).                                             */
 /******************************************************************************/
 
+/**
+ * @brief  This function handles PPP interrupt request.
+ * @param  None
+ * @retval None
+ */
+/*void PPP_IRQHandler(void)
+{
+}*/
 /**
  * @brief This function handles DMA1 channel2 global interrupt.
  */
@@ -142,35 +143,6 @@ void FDCAN1_IT0_IRQHandler(void) {
     HAL_FDCAN_IRQHandler(can_get_device_handle());
 }
 
-/**
- * @brief This function handles TIM1 update interrupt and TIM16 global
- * interrupt.
- */
- __attribute__((section(".ccmram")))
-void TIM1_UP_TIM16_IRQHandler(void) {
-    // We ONLY ever enable the Update interrupt, so for a small efficiency gain
-    // we always make the assumption that this interrupt was triggered by the
-    // TIM_IT_UPDATE source.
-    // __HAL_TIM_CLEAR_IT(&htim1, TIM_IT_UPDATE);
-    //call_brushed_motor_handler();
-    HAL_TIM_IRQHandler(&htim1);
- }
-
-/**
- * @brief This function handles TIM1 capture/compare interrupt.
- */
-__attribute__((section(".ccmram")))
-void TIM1_CC_IRQHandler(void) { HAL_TIM_IRQHandler(&htim1); }
-
-__attribute__((section(".ccmram")))
-void TIM2_IRQHandler(void) { HAL_TIM_IRQHandler(&htim2); }
-
-__attribute__((section(".ccmram")))
-void TIM3_IRQHandler(void) { HAL_TIM_IRQHandler(&htim3); }
-
-__attribute__((section(".ccmram")))
-void TIM1_BRK_TIM15_IRQHandler(void) { HAL_TIM_IRQHandler(&htim15); }
-
 extern void xPortSysTickHandler(void);
 void SysTick_Handler(void) {
     HAL_IncTick();
diff --git a/hepa-uv/firmware/stm32g4xx_it.h b/hepa-uv/firmware/stm32g4xx_it.h
index 3354a2cda..42e65e4a2 100644
--- a/hepa-uv/firmware/stm32g4xx_it.h
+++ b/hepa-uv/firmware/stm32g4xx_it.h
@@ -1,21 +1,21 @@
 /**
- ******************************************************************************
- * @file    Templates/Inc/stm32g4xx_it.h
- * @author  MCD Application Team
- * @brief   This file contains the headers of the interrupt handlers.
- ******************************************************************************
- * @attention
- *
- * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
- * All rights reserved.</center></h2>
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- ******************************************************************************
- */
+  ******************************************************************************
+  * @file    Templates/Inc/stm32g4xx_it.h
+  * @author  MCD Application Team
+  * @brief   This file contains the headers of the interrupt handlers.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef STM32G4xx_IT_H
@@ -43,11 +43,6 @@ void SysTick_Handler(void);
 void DMA1_Channel2_IRQHandler(void);
 void DMA1_Channel3_IRQHandler(void);
 void FDCAN1_IT0_IRQHandler(void);
-void TIM1_CC_IRQHandler(void);
-void TIM3_IRQHandler(void);
-void TIM7_IRQHandler(void);
-void TIM8_CC_IRQHandler(void);
-void TIM8_UP_IRQHandler(void);
 
 #ifdef __cplusplus
 }