removed unneeded dependencies and added to device