GNS-85: Fixed, removed unneeded dependencies
GNS-85: Fixed #2, removed unneeded dependencies