diff --git a/APMrover2/Rover.cpp b/APMrover2/Rover.cpp
index d6ca3d6981..00cbd1b0ce 100644
--- a/APMrover2/Rover.cpp
+++ b/APMrover2/Rover.cpp
@@ -25,9 +25,6 @@ Rover::Rover(void) :
     channel_steer(NULL),
     channel_throttle(NULL),
     channel_learn(NULL),
-#if defined(HAL_BOARD_LOG_DIRECTORY)
-    DataFlash(HAL_BOARD_LOG_DIRECTORY),
-#endif
     in_log_download(false),
     modes(&g.mode1),
     L1_controller(ahrs),
diff --git a/APMrover2/Rover.h b/APMrover2/Rover.h
index 1acda66369..801f214c74 100644
--- a/APMrover2/Rover.h
+++ b/APMrover2/Rover.h
@@ -133,16 +133,7 @@ private:
     RC_Channel *channel_throttle;
     RC_Channel *channel_learn;
 
-    // DataFlash
-#if CONFIG_HAL_BOARD == HAL_BOARD_APM1
-    DataFlash_APM1 DataFlash;
-#elif CONFIG_HAL_BOARD == HAL_BOARD_APM2
-    DataFlash_APM2 DataFlash;
-#elif defined(HAL_BOARD_LOG_DIRECTORY)
-    DataFlash_File DataFlash;
-#else
-    DataFlash_Empty DataFlash;
-#endif
+    DataFlash_Class DataFlash;
 
     bool in_log_download;