The check for deviceinfo is not needed
Merge pull request #150 from zefciu/RBM-69

The check for deviceinfo is not needed