dependency cleanup
fix remaining dependency convergence problems