Cleanup
- Remove duplicate DeviceUtils