Removed unused require
Improved device API methods