diff --git a/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_death_stack_x_maker_faire/interfaces-impl/bsp.cpp b/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_death_stack_x_maker_faire/interfaces-impl/bsp.cpp
index 4177d8f985dea9b7cfd9e27e5a52286dfa4f99f4..108263a6f2ac8092f559547414b434006b5fe877 100644
--- a/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_death_stack_x_maker_faire/interfaces-impl/bsp.cpp
+++ b/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_death_stack_x_maker_faire/interfaces-impl/bsp.cpp
@@ -340,46 +340,6 @@ void IRQbspInit()
 
     RCC_SYNC();
 
-    // interfaces::spi1::sck::mode(Mode::ALTERNATE);
-    // interfaces::spi1::sck::alternateFunction(5);
-    // interfaces::spi1::miso::mode(Mode::ALTERNATE);
-    // interfaces::spi1::miso::alternateFunction(5);
-    // interfaces::spi1::mosi::mode(Mode::ALTERNATE);
-    // interfaces::spi1::mosi::alternateFunction(5);
-
-    // interfaces::spi2::sck::mode(Mode::ALTERNATE);
-    // interfaces::spi2::sck::alternateFunction(5);
-    // interfaces::spi2::miso::mode(Mode::ALTERNATE);
-    // interfaces::spi2::miso::alternateFunction(5);
-    // interfaces::spi2::mosi::mode(Mode::ALTERNATE);
-    // interfaces::spi2::mosi::alternateFunction(5);
-
-    // interfaces::spi4::sck::mode(Mode::ALTERNATE);
-    // interfaces::spi4::sck::alternateFunction(5);
-    // interfaces::spi4::miso::mode(Mode::ALTERNATE);
-    // interfaces::spi4::miso::alternateFunction(5);
-    // interfaces::spi4::mosi::mode(Mode::ALTERNATE);
-    // interfaces::spi4::mosi::alternateFunction(5);
-
-    // interfaces::spi5::sck::mode(Mode::ALTERNATE);
-    // interfaces::spi5::sck::alternateFunction(5);
-    // interfaces::spi5::miso::mode(Mode::ALTERNATE);
-    // interfaces::spi5::miso::alternateFunction(5);
-    // interfaces::spi5::mosi::mode(Mode::ALTERNATE);
-    // interfaces::spi5::mosi::alternateFunction(5);
-
-    // interfaces::spi6::sck::mode(Mode::ALTERNATE);
-    // interfaces::spi6::sck::alternateFunction(5);
-    // interfaces::spi6::miso::mode(Mode::ALTERNATE);
-    // interfaces::spi6::miso::alternateFunction(5);
-    // interfaces::spi6::mosi::mode(Mode::ALTERNATE);
-    // interfaces::spi6::mosi::alternateFunction(5);
-
-    // interfaces::usart1::rx::mode(Mode::ALTERNATE);
-    // interfaces::usart1::rx::alternateFunction(7);
-    // interfaces::usart1::tx::mode(Mode::ALTERNATE);
-    // interfaces::usart1::tx::alternateFunction(7);
-
     interfaces::usart2::rx::mode(Mode::ALTERNATE);
     interfaces::usart2::rx::alternateFunction(7);
     interfaces::usart2::tx::mode(Mode::ALTERNATE);
@@ -394,58 +354,14 @@ void IRQbspInit()
     interfaces::uart4::rx::alternateFunction(8);
     interfaces::uart4::tx::mode(Mode::ALTERNATE);
     interfaces::uart4::tx::alternateFunction(8);
-
-    // interfaces::can1::rx::mode(Mode::ALTERNATE);
-    // interfaces::can1::rx::alternateFunction(9);
-    // interfaces::can1::tx::mode(Mode::ALTERNATE);
-    // interfaces::can1::tx::alternateFunction(9);
-
-    // sensors::ads131m04::cs1::mode(Mode::OUTPUT);
-    // sensors::ads131m04::cs1::high();
-
-    // sensors::bmx160::cs::mode(Mode::OUTPUT);
-    // sensors::bmx160::cs::high();
-    // sensors::bmx160::intr::mode(Mode::INPUT_PULL_UP);
-
-    // sensors::mpu9250::cs::mode(Mode::OUTPUT);
-    // sensors::mpu9250::cs::high();
-
-    // sensors::cc3135::cs::mode(Mode::OUTPUT);
-    // sensors::cc3135::cs::high();
-    // sensors::cc3135::intr::mode(Mode::INPUT_PULL_UP);
-
-    // sensors::sx127x::cs::mode(Mode::OUTPUT);
-    // sensors::sx127x::cs::high();
-    // sensors::sx127x::dio0::mode(Mode::INPUT);
-
-    // sensors::gps::cs::mode(Mode::OUTPUT);
-    // sensors::gps::cs::high();
-
-    // sensors::ms5803::cs::mode(Mode::OUTPUT);
-    // sensors::ms5803::cs::high();
-
-    // sensors::mlx91221_1::vout::mode(Mode::INPUT_ANALOG);
-    // sensors::mlx91221_1::vout::high();
-
-    // sensors::mlx91221_2::vout::mode(Mode::INPUT_ANALOG);
-    // sensors::mlx91221_2::vout::high();
-
     sensors::launchpad_detach::mode(Mode::INPUT);
 
     expulsion::servo::mode(Mode::ALTERNATE);
     expulsion::servo::alternateFunction(2);
-    // expulsion::sense::mode(Mode::INPUT_PULL_UP);
     expulsion::nosecone_detach::mode(Mode::INPUT);
 
-    // cutter::enable::mode(Mode::OUTPUT);
-    // cutter::enable::low();
-    // cutter::enable_backup::mode(Mode::OUTPUT);
-    // cutter::enable_backup::low();
-    // cutter::sense::mode(Mode::INPUT_ANALOG);
-
     airbrakes::servo::mode(Mode::ALTERNATE);
     airbrakes::servo::alternateFunction(3);
-    // airbrakes::sensor::mode(Mode::INPUT_ANALOG);
 
     inputs::vbat::mode(Mode::INPUT_ANALOG);
 
@@ -460,8 +376,6 @@ void IRQbspInit()
 
     aux::servo::mode(Mode::ALTERNATE);
     aux::servo::alternateFunction(3);
-    // aux::sense_1::mode(Mode::INPUT);
-    // aux::sense_2::mode(Mode::INPUT);
 
     DefaultConsole::instance().IRQset(intrusive_ref_ptr<Device>(
         new STM32Serial(defaultSerial, defaultSerialSpeed,
diff --git a/miosix/config/options.cmake b/miosix/config/options.cmake
index 158380cd9f9f0e1b1d2dd014dd46ed45e3861d90..73797abac23c399c8cffaaf6f912ea80be693308 100644
--- a/miosix/config/options.cmake
+++ b/miosix/config/options.cmake
@@ -2331,8 +2331,8 @@ elseif(${ARCH} STREQUAL cortexM4_stm32f4)
         )
 
         ## Add a #define to allow querying board name
-        list(APPEND CFLAGS_BASE -D_BOARD_STM32F429ZI_SKYWARD_DEATHST_X)
-        list(APPEND CXXFLAGS_BASE -D_BOARD_STM32F429ZI_SKYWARD_DEATHST_X)
+        list(APPEND CFLAGS_BASE -D_BOARD_STM32F429ZI_SKYWARD_DEATHST_X_MAKER_FAIRE)
+        list(APPEND CXXFLAGS_BASE -D_BOARD_STM32F429ZI_SKYWARD_DEATHST_X_MAKER_FAIRE)
 
         ## Select programmer command line
         ## This is the program that is invoked when the user types