simplify dependencies a bit