Simplification and upgrade of dependencies