Revert "Fixed analyzer error"

This reverts commit bca4aa2cc3d5e7b55d4ea9b43c936d7aeb690078.
Revert "Quick fix to close the USB device connection properly."

This reverts commit f6c93cb924125cb3091950249bb9b96a7f348180.
Version: version": "0.9.1536.8