diff --git a/src/Vehicle/BatteryFact.json b/src/Vehicle/BatteryFact.json
index 7312ff4..9521501 100644
--- a/src/Vehicle/BatteryFact.json
+++ b/src/Vehicle/BatteryFact.json
@@ -35,13 +35,6 @@
     "units":            "C"
 },
 {
-    "name":             "cellCount",
-    "shortDescription": "Cell Count",
-    "type":             "double",
-    "decimalPlaces":    0,
-    "decimalPlaces":    0
-},
-{
     "name":             "instantPower",
     "shortDescription": "Watts",
     "type":             "double",
diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc
index 8df222b..7512f55 100644
--- a/src/Vehicle/Vehicle.cc
+++ b/src/Vehicle/Vehicle.cc
@@ -1613,22 +1613,18 @@ void Vehicle::_handleBatteryStatus(mavlink_message_t& message)
         return;
     }
 
-    int cellCount = 0;
     double voltage = qQNaN();
     for (int i=0; i<10; i++) {
         double cellVoltage = bat_status.voltages[i] == UINT16_MAX ? qQNaN() : static_cast<double>(bat_status.voltages[i]) / 1000.0;
         if (qIsNaN(cellVoltage)) {
             break;
         }
-        cellCount++;
         if (i == 0) {
             voltage = cellVoltage;
         } else {
             voltage += cellVoltage;
         }
     }
-    pBatteryFactGroup->cellCount()->setRawValue(cellCount == 0 ? qQNaN() : cellCount);
-
 
     pBatteryFactGroup->temperature()->setRawValue(bat_status.temperature == INT16_MAX ? qQNaN() : static_cast<double>(bat_status.temperature) / 100.0);
     pBatteryFactGroup->mahConsumed()->setRawValue(bat_status.current_consumed == -1  ? qQNaN() : bat_status.current_consumed);
@@ -4265,7 +4261,6 @@ const char* VehicleBatteryFactGroup::_percentRemainingFactName =            "per
 const char* VehicleBatteryFactGroup::_mahConsumedFactName =                 "mahConsumed";
 const char* VehicleBatteryFactGroup::_currentFactName =                     "current";
 const char* VehicleBatteryFactGroup::_temperatureFactName =                 "temperature";
-const char* VehicleBatteryFactGroup::_cellCountFactName =                   "cellCount";
 const char* VehicleBatteryFactGroup::_instantPowerFactName =                "instantPower";
 const char* VehicleBatteryFactGroup::_timeRemainingFactName =               "timeRemaining";
 const char* VehicleBatteryFactGroup::_chargeStateFactName =                 "chargeState";
@@ -4279,7 +4274,6 @@ VehicleBatteryFactGroup::VehicleBatteryFactGroup(QObject* parent)
     , _mahConsumedFact              (0, _mahConsumedFactName,               FactMetaData::valueTypeDouble)
     , _currentFact                  (0, _currentFactName,                   FactMetaData::valueTypeDouble)
     , _temperatureFact              (0, _temperatureFactName,               FactMetaData::valueTypeDouble)
-    , _cellCountFact                (0, _cellCountFactName,                 FactMetaData::valueTypeDouble)
     , _instantPowerFact             (0, _instantPowerFactName,              FactMetaData::valueTypeDouble)
     , _timeRemainingFact            (0, _timeRemainingFactName,             FactMetaData::valueTypeDouble)
     , _chargeStateFact              (0, _chargeStateFactName,               FactMetaData::valueTypeUint8)
@@ -4289,7 +4283,6 @@ VehicleBatteryFactGroup::VehicleBatteryFactGroup(QObject* parent)
     _addFact(&_mahConsumedFact,             _mahConsumedFactName);
     _addFact(&_currentFact,                 _currentFactName);
     _addFact(&_temperatureFact,             _temperatureFactName);
-    _addFact(&_cellCountFact,               _cellCountFactName);
     _addFact(&_instantPowerFact,            _instantPowerFactName);
     _addFact(&_timeRemainingFact,           _timeRemainingFactName);
     _addFact(&_chargeStateFact,             _chargeStateFactName);
@@ -4300,7 +4293,6 @@ VehicleBatteryFactGroup::VehicleBatteryFactGroup(QObject* parent)
     _mahConsumedFact.setRawValue        (qQNaN());
     _currentFact.setRawValue            (qQNaN());
     _temperatureFact.setRawValue        (qQNaN());
-    _cellCountFact.setRawValue          (qQNaN());
     _instantPowerFact.setRawValue       (qQNaN());
     _timeRemainingFact.setRawValue      (qQNaN());
     _chargeStateFact.setRawValue        (MAV_BATTERY_CHARGE_STATE_UNDEFINED);
diff --git a/src/Vehicle/Vehicle.h b/src/Vehicle/Vehicle.h
index 3f34226..b124d80 100644
--- a/src/Vehicle/Vehicle.h
+++ b/src/Vehicle/Vehicle.h
@@ -256,7 +256,6 @@ public:
     Q_PROPERTY(Fact* mahConsumed        READ mahConsumed        CONSTANT)
     Q_PROPERTY(Fact* current            READ current            CONSTANT)
     Q_PROPERTY(Fact* temperature        READ temperature        CONSTANT)
-    Q_PROPERTY(Fact* cellCount          READ cellCount          CONSTANT)
     Q_PROPERTY(Fact* instantPower       READ instantPower       CONSTANT)
     Q_PROPERTY(Fact* timeRemaining      READ timeRemaining      CONSTANT)
     Q_PROPERTY(Fact* chargeState        READ chargeState        CONSTANT)
@@ -266,7 +265,6 @@ public:
     Fact* mahConsumed               () { return &_mahConsumedFact; }
     Fact* current                   () { return &_currentFact; }
     Fact* temperature               () { return &_temperatureFact; }
-    Fact* cellCount                 () { return &_cellCountFact; }
     Fact* instantPower              () { return &_instantPowerFact; }
     Fact* timeRemaining             () { return &_timeRemainingFact; }
     Fact* chargeState               () { return &_chargeStateFact; }
@@ -276,7 +274,6 @@ public:
     static const char* _mahConsumedFactName;
     static const char* _currentFactName;
     static const char* _temperatureFactName;
-    static const char* _cellCountFactName;
     static const char* _instantPowerFactName;
     static const char* _timeRemainingFactName;
     static const char* _chargeStateFactName;
@@ -289,7 +286,6 @@ private:
     Fact            _mahConsumedFact;
     Fact            _currentFact;
     Fact            _temperatureFact;
-    Fact            _cellCountFact;
     Fact            _instantPowerFact;
     Fact            _timeRemainingFact;
     Fact            _chargeStateFact;