cleanups
Work on dependency convergence