DEVIDM-55 - Removed unneeded dependencies