Cleaning up some of the dependencies and their versioning.