Simplify and centralize dependencies