Removed unneeded dependencies.
Merge branch 'dev'