diff --git a/src/DeviceTypes.cpp b/src/DeviceTypes.cpp
index 9959a21b5..f7816b0ba 100644
--- a/src/DeviceTypes.cpp
+++ b/src/DeviceTypes.cpp
@@ -40,7 +40,7 @@ static DeviceType SupportedDevices[] =
         ":images/devices/garminusb.png" },
 #endif
 #ifdef GC_HAVE_WFAPI
-#if 0
+#if 0 //!!! Deferred until v3.1 or as an update to v3.0 when Wahoo support ANT+
       { DEV_BT40,    DEV_BTLE,     (char *) "Bluetooth 4.0", true,   false,
         "Bluetooth Low Energy devices such as KK Inride, Stages PM, Blue HR and Blue SC",
         ":images/devices/btle.png" },
diff --git a/src/RideFile.cpp b/src/RideFile.cpp
index 15a0921ba..f5d27f972 100644
--- a/src/RideFile.cpp
+++ b/src/RideFile.cpp
@@ -55,7 +55,7 @@ RideFile::~RideFile()
     foreach(RideFilePoint *point, dataPoints_)
         delete point;
     delete command;
-    if (data) delete data;
+    //!!! if (data) delete data; // need a mechanism to notify the editor
 }
 
 QString