Clean up some of the dependencies, get them in sync