Updating dependencies, simplifying it all