diff --git a/sw/airborne/boards/matek_f405_wing_v1.h b/sw/airborne/boards/matek_f405_wing_v1.h
index e3893f1e30..74b9a73a6c 100644
--- a/sw/airborne/boards/matek_f405_wing_v1.h
+++ b/sw/airborne/boards/matek_f405_wing_v1.h
@@ -25,17 +25,11 @@
 
 #define BOARD_MATEK_F405_WING
 
-/* OpenPilot Revo has a 8MHz external clock and 168MHz internal. */
+/* The Matek F405 Wing autopilot has a 8MHz external clock and 168MHz internal. */
 #define EXT_CLK 8000000
 #define AHB_CLK 168000000
 
-/* by default activate onboard baro */
-#ifndef USE_BARO_BOARD
-//#define USE_BARO_BOARD 1
-#endif
-
 // Onboard LEDs
-
 /* STAT blue, on PB5 */
 #ifndef USE_LED_1
 #define USE_LED_1 1
@@ -297,28 +291,7 @@
 
 #endif
 
-
-// PWM
-/*
-const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
-    { TIM4, IO_TAG(PB7),    TIM_Channel_2, 1, IOCFG_AF_PP_PD, GPIO_AF_TIM4,  TIM_USE_MC_MOTOR  | TIM_USE_FW_MOTOR },  //S1
-    { TIM4, IO_TAG(PB6),    TIM_Channel_1, 1, IOCFG_AF_PP_PD, GPIO_AF_TIM4,  TIM_USE_MC_MOTOR  | TIM_USE_FW_MOTOR },  //S2
-    { TIM3, IO_TAG(PB0),    TIM_Channel_3, 1, IOCFG_AF_PP_PD, GPIO_AF_TIM3,  TIM_USE_MC_MOTOR  | TIM_USE_FW_SERVO },  //S3
-    { TIM3, IO_TAG(PB1),    TIM_Channel_4, 1, IOCFG_AF_PP_PD, GPIO_AF_TIM3,  TIM_USE_MC_MOTOR  | TIM_USE_FW_SERVO },  //S4
-    { TIM8, IO_TAG(PC8),    TIM_Channel_3, 1, IOCFG_AF_PP_PD, GPIO_AF_TIM8,  TIM_USE_MC_MOTOR  | TIM_USE_FW_SERVO },  //S5
-    { TIM8, IO_TAG(PC9),    TIM_Channel_4, 1, IOCFG_AF_PP_PD, GPIO_AF_TIM8,  TIM_USE_MC_MOTOR  | TIM_USE_FW_SERVO },  //S6
-    { TIM12, IO_TAG(PB14),  TIM_Channel_1, 1, IOCFG_AF_PP_PD, GPIO_AF_TIM12, TIM_USE_MC_SERVO  | TIM_USE_FW_SERVO },  //S7
-    { TIM12, IO_TAG(PB15),  TIM_Channel_2, 1, IOCFG_AF_PP_PD, GPIO_AF_TIM12, TIM_USE_MC_SERVO  | TIM_USE_FW_SERVO },  //S8
-    { TIM1, IO_TAG(PA8),    TIM_Channel_1, 1, IOCFG_AF_PP_PD, GPIO_AF_TIM1,  TIM_USE_MC_CHNFW  | TIM_USE_FW_SERVO },  //S9
-
-    { TIM2, IO_TAG(PA15),   TIM_Channel_1, 1, IOCFG_AF_PP_PD, GPIO_AF_TIM2, TIM_USE_LED },  //2812LED
-    { TIM9, IO_TAG(PA3),    TIM_Channel_2, 0, IOCFG_AF_PP_PD, GPIO_AF_TIM9, TIM_USE_PPM },  //RX2
-
-    { TIM5, IO_TAG(PA2),    TIM_Channel_3, 1, IOCFG_AF_PP_PD, GPIO_AF_TIM5, TIM_USE_PWM },  //TX2  softserial1_Tx
-};
-
-*/
-
+// SERVO DEFINITIONS
 #define PWM_USE_TIM1  0
 #define PWM_USE_TIM3  1
 #define PWM_USE_TIM4  1