more simplification of the dependency handling