Removed all device dependancies