removed unneeded dependencies and add to device