Update to DS code for getDeviceCount() when cleaning out devices that may have disapp...