diff --git a/Blimp/system.cpp b/Blimp/system.cpp
index 5b46cddb549e3a..388cec4b311164 100644
--- a/Blimp/system.cpp
+++ b/Blimp/system.cpp
@@ -254,15 +254,7 @@ const char* Blimp::get_frame_string()
  */
 void Blimp::allocate_motors(void)
 {
-    switch ((Fins::motor_frame_class)g2.frame_class.get()) {
-    case Fins::MOTOR_FRAME_FOUR_MOTOR:
-        motors = new Fins(blimp.scheduler.get_loop_rate_hz(), Fins::MOTOR_FRAME_FOUR_MOTOR);
-        break;
-    case Fins::MOTOR_FRAME_FISHBLIMP:
-    default:
-        motors = new Fins(blimp.scheduler.get_loop_rate_hz(), Fins::MOTOR_FRAME_FISHBLIMP);
-        break;
-    }
+    motors = new Fins(blimp.scheduler.get_loop_rate_hz(), (Fins::motor_frame_class)g2.frame_class.get());
     if (motors == nullptr) {
         AP_BoardConfig::allocation_error("FRAME_CLASS=%u", (unsigned)g2.frame_class.get());
     }