diff --git a/ArduPlane/GCS_Plane.cpp b/ArduPlane/GCS_Plane.cpp
index b513b1d087..e2ec3149c8 100644
--- a/ArduPlane/GCS_Plane.cpp
+++ b/ArduPlane/GCS_Plane.cpp
@@ -1,6 +1,11 @@
 #include "GCS_Plane.h"
 #include "Plane.h"
 
+uint8_t GCS_Plane::sysid_this_mav() const
+{
+    return plane.g.sysid_this_mav;
+}
+
 void GCS_Plane::update_vehicle_sensor_status_flags(void)
 {
     // first what sensors/controllers we have
diff --git a/ArduPlane/GCS_Plane.h b/ArduPlane/GCS_Plane.h
index 64e87c9f0d..33d6becddb 100644
--- a/ArduPlane/GCS_Plane.h
+++ b/ArduPlane/GCS_Plane.h
@@ -27,6 +27,7 @@ public:
 
 protected:
 
+    uint8_t sysid_this_mav() const override;
     void update_vehicle_sensor_status_flags(void) override;
     uint32_t custom_mode() const override;
     MAV_TYPE frame_type() const override;
diff --git a/ArduPlane/Plane.h b/ArduPlane/Plane.h
index a102f216a7..aa4620d67c 100644
--- a/ArduPlane/Plane.h
+++ b/ArduPlane/Plane.h
@@ -869,7 +869,7 @@ private:
     void update_fbwb_speed_height(void);
     void setup_turn_angle(void);
     bool reached_loiter_target(void);
-    void set_control_channels(void);
+    void set_control_channels(void) override;
     void init_rc_in();
     void init_rc_out_main();
     void init_rc_out_aux();
diff --git a/ArduPlane/system.cpp b/ArduPlane/system.cpp
index 1b68588d25..914575560e 100644
--- a/ArduPlane/system.cpp
+++ b/ArduPlane/system.cpp
@@ -31,16 +31,6 @@ void Plane::init_ardupilot()
 
     ins.set_log_raw_bit(MASK_LOG_IMU_RAW);
 
-    set_control_channels();
-
-    mavlink_system.sysid = g.sysid_this_mav;
-
-    // initialise serial ports
-    serial_manager.init();
-    gcs().setup_console();
-
-    register_scheduler_delay_callback();
-
     // setup any board specific drivers
     BoardConfig.init();
 #if HAL_WITH_UAVCAN