Cleaning up some of the dependencies and their versioning.
11 files changed