Merge "Removing unused dependencies"