diff --git a/libraries/DataFlash/DataFlash.h b/libraries/DataFlash/DataFlash.h
index 3d3673bcf4..78f0711dc5 100644
--- a/libraries/DataFlash/DataFlash.h
+++ b/libraries/DataFlash/DataFlash.h
@@ -53,21 +53,17 @@ public:
     FUNCTOR_TYPEDEF(print_mode_fn, void, AP_HAL::BetterStream*, uint8_t);
     FUNCTOR_TYPEDEF(vehicle_startup_message_Log_Writer, void);
 
-    static DataFlash_Class create(const char *firmware_string, const AP_Int32 &log_bitmask) {
-        return DataFlash_Class{firmware_string, log_bitmask};
-    }
+    DataFlash_Class(const char *firmware_string, const AP_Int32 &log_bitmask);
+
+    /* Do not allow copies */
+    DataFlash_Class(const DataFlash_Class &other) = delete;
+    DataFlash_Class &operator=(const DataFlash_Class&) = delete;
 
     // get singleton instance
     static DataFlash_Class *instance(void) {
         return _instance;
     }
 
-    constexpr DataFlash_Class(DataFlash_Class &&other) = default;
-
-    /* Do not allow copies */
-    DataFlash_Class(const DataFlash_Class &other) = delete;
-    DataFlash_Class &operator=(const DataFlash_Class&) = delete;
-
     void set_mission(const AP_Mission *mission);
 
     // initialisation
@@ -248,8 +244,6 @@ protected:
                                bool is_critical);
 
 private:
-    DataFlash_Class(const char *firmware_string, const AP_Int32 &log_bitmask);
-
     #define DATAFLASH_MAX_BACKENDS 2
     uint8_t _next_backend;
     DataFlash_Backend *backends[DATAFLASH_MAX_BACKENDS];
diff --git a/libraries/DataFlash/examples/DataFlash_AllTypes/DataFlash_AllTypes.cpp b/libraries/DataFlash/examples/DataFlash_AllTypes/DataFlash_AllTypes.cpp
index 173e13c4c5..089033e9de 100644
--- a/libraries/DataFlash/examples/DataFlash_AllTypes/DataFlash_AllTypes.cpp
+++ b/libraries/DataFlash/examples/DataFlash_AllTypes/DataFlash_AllTypes.cpp
@@ -91,7 +91,7 @@ public:
 private:
 
     AP_Int32 log_bitmask;
-    DataFlash_Class dataflash = DataFlash_Class::create("DF AllTypes 0.2", log_bitmask);
+    DataFlash_Class dataflash{"DF AllTypes 0.2", log_bitmask};
     void print_mode(AP_HAL::BetterStream *port, uint8_t mode);
 
     void Log_Write_TypeMessages();
diff --git a/libraries/DataFlash/examples/DataFlash_test/DataFlash_test.cpp b/libraries/DataFlash/examples/DataFlash_test/DataFlash_test.cpp
index 3fc5f76f08..03b72e3525 100644
--- a/libraries/DataFlash/examples/DataFlash_test/DataFlash_test.cpp
+++ b/libraries/DataFlash/examples/DataFlash_test/DataFlash_test.cpp
@@ -41,7 +41,7 @@ public:
 private:
 
     AP_Int32 log_bitmask;
-    DataFlash_Class dataflash = DataFlash_Class::create("DF Test 0.1", log_bitmask);
+    DataFlash_Class dataflash{"DF Test 0.1", log_bitmask};
     void print_mode(AP_HAL::BetterStream *port, uint8_t mode);
 };