Removes universal support
Merge branch 'hotfix/device-support'